X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fdt_object.c;h=e486f06967a9c3c74955d29a992e6bb7bde80327;hb=11c63d251e4d121bab0e97ccd69e9fd6d5ba38e4;hp=79c160ec1873f8fe0334ee17d35e35883279d94c;hpb=65224bacf78ff7fdb8502bb1c2655223f6a1bb44;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c index 79c160e..e486f06 100644 --- a/lustre/obdclass/dt_object.c +++ b/lustre/obdclass/dt_object.c @@ -26,8 +26,10 @@ * 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. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -60,7 +62,6 @@ struct dt_find_hint { struct dt_thread_info { char dti_buf[DT_MAX_PATH]; - struct lu_fid_pack dti_pack; struct dt_find_hint dti_dfh; }; @@ -79,31 +80,34 @@ static struct lu_context_key dt_key = { */ 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) { - list_del_init(&cb->dtc_linkage); + cfs_list_del_init(&cb->dtc_linkage); } EXPORT_SYMBOL(dt_txn_callback_del); int dt_txn_hook_start(const struct lu_env *env, - struct dt_device *dev, struct txn_param *param) + struct dt_device *dev, struct thandle *th) { - int result; + int rc = 0; struct dt_txn_callback *cb; - result = 0; - list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) { - if (cb->dtc_txn_start == NULL) + if (th->th_local) + return 0; + + 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; - result = cb->dtc_txn_start(env, param, cb->dtc_cookie); - if (result < 0) + rc = cb->dtc_txn_start(env, th, cb->dtc_cookie); + if (rc < 0) break; } - return result; + return rc; } EXPORT_SYMBOL(dt_txn_hook_start); @@ -111,35 +115,35 @@ int dt_txn_hook_stop(const struct lu_env *env, struct thandle *txn) { struct dt_device *dev = txn->th_dev; struct dt_txn_callback *cb; - int result; + int rc = 0; - result = 0; - list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) { - if (cb->dtc_txn_stop == NULL) + if (txn->th_local) + return 0; + + 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; - result = cb->dtc_txn_stop(env, txn, cb->dtc_cookie); - if (result < 0) + rc = cb->dtc_txn_stop(env, txn, cb->dtc_cookie); + if (rc < 0) break; } - return result; + return rc; } EXPORT_SYMBOL(dt_txn_hook_stop); -int dt_txn_hook_commit(const struct lu_env *env, struct thandle *txn) +void dt_txn_hook_commit(struct thandle *txn) { - struct dt_device *dev = txn->th_dev; struct dt_txn_callback *cb; - int result; - result = 0; - list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) { - if (cb->dtc_txn_commit == NULL) - continue; - result = cb->dtc_txn_commit(env, txn, cb->dtc_cookie); - if (result < 0) - break; + if (txn->th_local) + return; + + cfs_list_for_each_entry(cb, &txn->th_dev->dd_txn_callbacks, + dtc_linkage) { + if (cb->dtc_txn_commit) + cb->dtc_txn_commit(txn, cb->dtc_cookie); } - return result; } EXPORT_SYMBOL(dt_txn_hook_commit); @@ -205,34 +209,21 @@ enum dt_format_type dt_mode_to_dft(__u32 mode) } return result; } - EXPORT_SYMBOL(dt_mode_to_dft); + /** * lookup fid for object named \a name in directory \a dir. */ -static int dt_lookup(const struct lu_env *env, struct dt_object *dir, - const char *name, struct lu_fid *fid) +int dt_lookup_dir(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; - const struct dt_key *key = (const struct dt_key *)name; - int result; - - if (dt_try_as_dir(env, dir)) { - result = dir->do_index_ops->dio_lookup(env, dir, rec, key, - BYPASS_CAPA); - if (result > 0) - result = fid_unpack(pack, fid); - else if (result == 0) - result = -ENOENT; - } else - result = -ENOTDIR; - return result; + if (dt_try_as_dir(env, dir)) + return dt_lookup(env, dir, (struct dt_rec *)fid, + (const struct dt_key *)name, BYPASS_CAPA); + return -ENOTDIR; } - +EXPORT_SYMBOL(dt_lookup_dir); /** * get object for given \a fid. */ @@ -265,7 +256,7 @@ static int dt_find_entry(const struct lu_env *env, const char *entry, void *data struct dt_object *obj = dfh->dfh_o; int result; - result = dt_lookup(env, obj, entry, fid); + result = dt_lookup_dir(env, obj, entry, fid); lu_object_put(env, &obj->do_lu); if (result == 0) { obj = dt_locate(env, dt, fid); @@ -349,7 +340,7 @@ static struct dt_object *dt_reg_open(const struct lu_env *env, struct dt_object *o; int result; - result = dt_lookup(env, p, name, fid); + result = dt_lookup_dir(env, p, name, fid); if (result == 0){ o = dt_locate(env, dt, fid); } @@ -400,5 +391,91 @@ void dt_global_fini(void) lu_context_key_degister(&dt_key); } +int dt_record_read(const struct lu_env *env, struct dt_object *dt, + struct lu_buf *buf, loff_t *pos) +{ + int rc; + + LASSERTF(dt != NULL, "dt is NULL when we want to read record\n"); + + rc = dt->do_body_ops->dbo_read(env, dt, buf, pos, BYPASS_CAPA); + + if (rc == buf->lb_len) + rc = 0; + else if (rc >= 0) + rc = -EFAULT; + return rc; +} +EXPORT_SYMBOL(dt_record_read); + +int dt_record_write(const struct lu_env *env, struct dt_object *dt, + const struct lu_buf *buf, loff_t *pos, struct thandle *th) +{ + int rc; + + LASSERTF(dt != NULL, "dt is NULL when we want to write record\n"); + LASSERT(th != NULL); + LASSERT(dt->do_body_ops); + LASSERT(dt->do_body_ops->dbo_write); + rc = dt->do_body_ops->dbo_write(env, dt, buf, pos, th, BYPASS_CAPA, 1); + if (rc == buf->lb_len) + rc = 0; + else if (rc >= 0) + rc = -EFAULT; + return rc; +} +EXPORT_SYMBOL(dt_record_write); + +int dt_declare_version_set(const struct lu_env *env, struct dt_object *o, + struct thandle *th) +{ + struct lu_buf vbuf; + char *xname = XATTR_NAME_VERSION; + + LASSERT(o); + vbuf.lb_buf = NULL; + vbuf.lb_len = sizeof(dt_obj_version_t); + return dt_declare_xattr_set(env, o, &vbuf, xname, 0, th); + +} +EXPORT_SYMBOL(dt_declare_version_set); + +void dt_version_set(const struct lu_env *env, struct dt_object *o, + dt_obj_version_t version, struct thandle *th) +{ + struct lu_buf vbuf; + char *xname = XATTR_NAME_VERSION; + int rc; + + LASSERT(o); + vbuf.lb_buf = &version; + vbuf.lb_len = sizeof(version); + + rc = dt_xattr_set(env, o, &vbuf, xname, 0, th, BYPASS_CAPA); + if (rc != 0) + CDEBUG(D_INODE, "Can't set version, rc %d\n", rc); + return; +} +EXPORT_SYMBOL(dt_version_set); + +dt_obj_version_t dt_version_get(const struct lu_env *env, struct dt_object *o) +{ + struct lu_buf vbuf; + char *xname = XATTR_NAME_VERSION; + dt_obj_version_t version; + int rc; + + LASSERT(o); + vbuf.lb_buf = &version; + vbuf.lb_len = sizeof(version); + rc = dt_xattr_get(env, o, &vbuf, xname, BYPASS_CAPA); + if (rc != sizeof(version)) { + CDEBUG(D_INODE, "Can't get version, rc %d\n", rc); + version = 0; + } + return version; +} +EXPORT_SYMBOL(dt_version_get); + const struct dt_index_features dt_directory_features; EXPORT_SYMBOL(dt_directory_features);