Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mass conversion of all copyright messages to Oracle.
[fs/lustre-release.git]
/
lustre
/
obdclass
/
dt_object.c
diff --git
a/lustre/obdclass/dt_object.c
b/lustre/obdclass/dt_object.c
index
e5d3c4d
..
3164187
100644
(file)
--- a/
lustre/obdclass/dt_object.c
+++ b/
lustre/obdclass/dt_object.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-60,7
+60,6
@@
struct dt_find_hint {
struct dt_thread_info {
char dti_buf[DT_MAX_PATH];
struct dt_thread_info {
char dti_buf[DT_MAX_PATH];
- struct lu_fid_pack dti_pack;
struct dt_find_hint dti_dfh;
};
struct dt_find_hint dti_dfh;
};
@@
-79,13
+78,13
@@
static struct lu_context_key dt_key = {
*/
void dt_txn_callback_add(struct dt_device *dev, struct dt_txn_callback *cb)
{
*/
void dt_txn_callback_add(struct dt_device *dev, struct dt_txn_callback *cb)
{
- list_add(&cb->dtc_linkage, &dev->dd_txn_callbacks);
+
cfs_
list_add(&cb->dtc_linkage, &dev->dd_txn_callbacks);
}
EXPORT_SYMBOL(dt_txn_callback_add);
void dt_txn_callback_del(struct dt_device *dev, struct dt_txn_callback *cb)
{
}
EXPORT_SYMBOL(dt_txn_callback_add);
void dt_txn_callback_del(struct dt_device *dev, struct dt_txn_callback *cb)
{
- list_del_init(&cb->dtc_linkage);
+
cfs_
list_del_init(&cb->dtc_linkage);
}
EXPORT_SYMBOL(dt_txn_callback_del);
}
EXPORT_SYMBOL(dt_txn_callback_del);
@@
-96,7
+95,7
@@
int dt_txn_hook_start(const struct lu_env *env,
struct dt_txn_callback *cb;
result = 0;
struct dt_txn_callback *cb;
result = 0;
- list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
+
cfs_
list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
if (cb->dtc_txn_start == NULL ||
!(cb->dtc_tag & env->le_ctx.lc_tags))
continue;
if (cb->dtc_txn_start == NULL ||
!(cb->dtc_tag & env->le_ctx.lc_tags))
continue;
@@
-115,7
+114,7
@@
int dt_txn_hook_stop(const struct lu_env *env, struct thandle *txn)
int result;
result = 0;
int result;
result = 0;
- list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
+
cfs_
list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
if (cb->dtc_txn_stop == NULL ||
!(cb->dtc_tag & env->le_ctx.lc_tags))
continue;
if (cb->dtc_txn_stop == NULL ||
!(cb->dtc_tag & env->le_ctx.lc_tags))
continue;
@@
-134,7
+133,7
@@
int dt_txn_hook_commit(const struct lu_env *env, struct thandle *txn)
int result;
result = 0;
int result;
result = 0;
- list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
+
cfs_
list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
if (cb->dtc_txn_commit == NULL ||
!(cb->dtc_tag & env->le_ctx.lc_tags))
continue;
if (cb->dtc_txn_commit == NULL ||
!(cb->dtc_tag & env->le_ctx.lc_tags))
continue;
@@
-217,10
+216,7
@@
EXPORT_SYMBOL(dt_mode_to_dft);
static int dt_lookup(const struct lu_env *env, struct dt_object *dir,
const char *name, struct lu_fid *fid)
{
static int dt_lookup(const struct lu_env *env, struct dt_object *dir,
const char *name, struct lu_fid *fid)
{
- struct dt_thread_info *info = lu_context_key_get(&env->le_ctx,
- &dt_key);
- struct lu_fid_pack *pack = &info->dti_pack;
- struct dt_rec *rec = (struct dt_rec *)pack;
+ struct dt_rec *rec = (struct dt_rec *)fid;
const struct dt_key *key = (const struct dt_key *)name;
int result;
const struct dt_key *key = (const struct dt_key *)name;
int result;
@@
-228,7
+224,7
@@
static int dt_lookup(const struct lu_env *env, struct dt_object *dir,
result = dir->do_index_ops->dio_lookup(env, dir, rec, key,
BYPASS_CAPA);
if (result > 0)
result = dir->do_index_ops->dio_lookup(env, dir, rec, key,
BYPASS_CAPA);
if (result > 0)
- result =
fid_unpack(pack, fid)
;
+ result =
0
;
else if (result == 0)
result = -ENOENT;
} else
else if (result == 0)
result = -ENOENT;
} else