X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flmv%2Flmv_obd.c;h=792cfd5aa19eaef64941cb465cfaa349bc3b646a;hp=cd0e4f9a9d1a84730e0871ac3ae903ffcc39ebbf;hb=b9cbb29935faa388d36b16140c7ef76a47754bec;hpb=24d98e71b740987a85c331114733e1ebeba5fd73 diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c index cd0e4f9..792cfd5 100644 --- a/lustre/lmv/lmv_obd.c +++ b/lustre/lmv/lmv_obd.c @@ -27,7 +27,7 @@ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,6 +38,10 @@ #include #include #include +#include +#ifdef HAVE_UIDGID_HEADER +# include +#endif #include #include #include @@ -53,71 +57,11 @@ #include #include #include -#include -#include #include #include +#include #include "lmv_internal.h" -/* This hash is only for testing purpose */ -static inline unsigned int -lmv_hash_all_chars(unsigned int count, const char *name, int namelen) -{ - unsigned int c = 0; - const unsigned char *p = (const unsigned char *)name; - - while (--namelen >= 0) - c += p[namelen]; - - c = c % count; - - return c; -} - -static inline unsigned int -lmv_hash_fnv1a(unsigned int count, const char *name, int namelen) -{ - __u64 hash; - - hash = lustre_hash_fnv_1a_64(name, namelen); - - hash = hash % count; - - return hash; -} - -int lmv_name_to_stripe_index(__u32 lmv_hash_type, unsigned int stripe_count, - const char *name, int namelen) -{ - int idx; - __u32 hash_type = lmv_hash_type & LMV_HASH_TYPE_MASK; - - LASSERT(namelen > 0); - if (stripe_count <= 1) - return 0; - - /* for migrating object, always start from 0 stripe */ - if (lmv_hash_type & LMV_HASH_FLAG_MIGRATION) - return 0; - - switch (hash_type) { - case LMV_HASH_TYPE_ALL_CHARS: - idx = lmv_hash_all_chars(stripe_count, name, namelen); - break; - case LMV_HASH_TYPE_FNV_1A_64: - idx = lmv_hash_fnv1a(stripe_count, name, namelen); - break; - default: - idx = -EBADFD; - break; - } - - CDEBUG(D_INFO, "name %.*s hash_type %d idx %d\n", namelen, name, - hash_type, idx); - - return idx; -} - static void lmv_activate_target(struct lmv_obd *lmv, struct lmv_tgt_desc *tgt, int activate) @@ -127,6 +71,8 @@ static void lmv_activate_target(struct lmv_obd *lmv, tgt->ltd_active = activate; lmv->desc.ld_active_tgt_count += (activate ? 1 : -1); + + tgt->ltd_exp->exp_obd->obd_inactive = !activate; } /** @@ -295,9 +241,9 @@ static int lmv_connect(const struct lu_env *env, lmv->conn_data = *data; if (lmv->targets_proc_entry == NULL) { - lmv->targets_proc_entry = lprocfs_seq_register("target_obds", - obd->obd_proc_entry, - NULL, NULL); + lmv->targets_proc_entry = lprocfs_register("target_obds", + obd->obd_proc_entry, + NULL, NULL); if (IS_ERR(lmv->targets_proc_entry)) { CERROR("%s: cannot register " "/proc/fs/lustre/%s/%s/target_obds\n", @@ -321,31 +267,8 @@ static int lmv_connect(const struct lu_env *env, RETURN(rc); } -static void lmv_set_timeouts(struct obd_device *obd) -{ - struct lmv_obd *lmv; - __u32 i; - - lmv = &obd->u.lmv; - if (lmv->server_timeout == 0) - return; - - if (lmv->connected == 0) - return; - - for (i = 0; i < lmv->desc.ld_tgt_count; i++) { - struct lmv_tgt_desc *tgt = lmv->tgts[i]; - - if (tgt == NULL || tgt->ltd_exp == NULL || !tgt->ltd_active) - continue; - - obd_set_info_async(NULL, tgt->ltd_exp, sizeof(KEY_INTERMDS), - KEY_INTERMDS, 0, NULL, NULL); - } -} - -static int lmv_init_ea_size(struct obd_export *exp, int easize, - int def_easize, int cookiesize, int def_cookiesize) +static int lmv_init_ea_size(struct obd_export *exp, __u32 easize, + __u32 def_easize) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -362,14 +285,7 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize, lmv->max_def_easize = def_easize; change = 1; } - if (lmv->max_cookiesize < cookiesize) { - lmv->max_cookiesize = cookiesize; - change = 1; - } - if (lmv->max_def_cookiesize < def_cookiesize) { - lmv->max_def_cookiesize = def_cookiesize; - change = 1; - } + if (change == 0) RETURN(0); @@ -384,8 +300,7 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize, continue; } - rc = md_init_ea_size(tgt->ltd_exp, easize, def_easize, - cookiesize, def_cookiesize); + rc = md_init_ea_size(tgt->ltd_exp, easize, def_easize); if (rc) { CERROR("%s: obd_init_ea_size() failed on MDT target %d:" " rc = %d\n", obd->obd_name, i, rc); @@ -470,8 +385,7 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) tgt->ltd_exp = mdc_exp; lmv->desc.ld_active_tgt_count++; - md_init_ea_size(tgt->ltd_exp, lmv->max_easize, lmv->max_def_easize, - lmv->max_cookiesize, lmv->max_def_cookiesize); + md_init_ea_size(tgt->ltd_exp, lmv->max_easize, lmv->max_def_easize); CDEBUG(D_CONFIG, "Connected to %s(%s) successfully (%d)\n", mdc_obd->obd_name, mdc_obd->obd_uuid.uuid, @@ -510,6 +424,7 @@ static void lmv_del_target(struct lmv_obd *lmv, int index) static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp, __u32 index, int gen) { + struct obd_device *mdc_obd; struct lmv_obd *lmv = &obd->u.lmv; struct lmv_tgt_desc *tgt; int orig_tgt_count = 0; @@ -517,28 +432,21 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp, ENTRY; CDEBUG(D_CONFIG, "Target uuid: %s. index %d\n", uuidp->uuid, index); - - lmv_init_lock(lmv); - - if (lmv->desc.ld_tgt_count == 0) { - struct obd_device *mdc_obd; - - mdc_obd = class_find_client_obd(uuidp, LUSTRE_MDC_NAME, - &obd->obd_uuid); - if (!mdc_obd) { - lmv_init_unlock(lmv); - CERROR("%s: Target %s not attached: rc = %d\n", - obd->obd_name, uuidp->uuid, -EINVAL); - RETURN(-EINVAL); - } + mdc_obd = class_find_client_obd(uuidp, LUSTRE_MDC_NAME, + &obd->obd_uuid); + if (!mdc_obd) { + CERROR("%s: Target %s not attached: rc = %d\n", + obd->obd_name, uuidp->uuid, -EINVAL); + RETURN(-EINVAL); } + mutex_lock(&lmv->lmv_init_mutex); if ((index < lmv->tgts_size) && (lmv->tgts[index] != NULL)) { tgt = lmv->tgts[index]; CERROR("%s: UUID %s already assigned at LOV target index %d:" " rc = %d\n", obd->obd_name, obd_uuid2str(&tgt->ltd_uuid), index, -EEXIST); - lmv_init_unlock(lmv); + mutex_unlock(&lmv->lmv_init_mutex); RETURN(-EEXIST); } @@ -552,7 +460,7 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp, newsize = newsize << 1; OBD_ALLOC(newtgts, sizeof(*newtgts) * newsize); if (newtgts == NULL) { - lmv_init_unlock(lmv); + mutex_unlock(&lmv->lmv_init_mutex); RETURN(-ENOMEM); } @@ -575,7 +483,7 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp, OBD_ALLOC_PTR(tgt); if (!tgt) { - lmv_init_unlock(lmv); + mutex_unlock(&lmv->lmv_init_mutex); RETURN(-ENOMEM); } @@ -589,22 +497,27 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp, lmv->desc.ld_tgt_count = index + 1; } - if (lmv->connected) { - rc = lmv_connect_mdc(obd, tgt); - if (rc != 0) { - spin_lock(&lmv->lmv_lock); - if (lmv->desc.ld_tgt_count == index + 1) - lmv->desc.ld_tgt_count = orig_tgt_count; - memset(tgt, 0, sizeof(*tgt)); - spin_unlock(&lmv->lmv_lock); - } else { - int easize = sizeof(struct lmv_stripe_md) + - lmv->desc.ld_tgt_count * sizeof(struct lu_fid); - lmv_init_ea_size(obd->obd_self_export, easize, 0, 0, 0); - } + if (lmv->connected == 0) { + /* lmv_check_connect() will connect this target. */ + mutex_unlock(&lmv->lmv_init_mutex); + RETURN(0); + } + + /* Otherwise let's connect it ourselves */ + mutex_unlock(&lmv->lmv_init_mutex); + rc = lmv_connect_mdc(obd, tgt); + if (rc != 0) { + spin_lock(&lmv->lmv_lock); + if (lmv->desc.ld_tgt_count == index + 1) + lmv->desc.ld_tgt_count = orig_tgt_count; + memset(tgt, 0, sizeof(*tgt)); + spin_unlock(&lmv->lmv_lock); + } else { + int easize = sizeof(struct lmv_stripe_md) + + lmv->desc.ld_tgt_count * sizeof(struct lu_fid); + lmv_init_ea_size(obd->obd_self_export, easize, 0); } - lmv_init_unlock(lmv); RETURN(rc); } @@ -620,14 +533,14 @@ int lmv_check_connect(struct obd_device *obd) if (lmv->connected) RETURN(0); - lmv_init_lock(lmv); + mutex_lock(&lmv->lmv_init_mutex); if (lmv->connected) { - lmv_init_unlock(lmv); + mutex_unlock(&lmv->lmv_init_mutex); RETURN(0); } if (lmv->desc.ld_tgt_count == 0) { - lmv_init_unlock(lmv); + mutex_unlock(&lmv->lmv_init_mutex); CERROR("%s: no targets configured.\n", obd->obd_name); RETURN(-EINVAL); } @@ -635,7 +548,7 @@ int lmv_check_connect(struct obd_device *obd) LASSERT(lmv->tgts != NULL); if (lmv->tgts[0] == NULL) { - lmv_init_unlock(lmv); + mutex_unlock(&lmv->lmv_init_mutex); CERROR("%s: no target configured for index 0.\n", obd->obd_name); RETURN(-EINVAL); @@ -653,12 +566,11 @@ int lmv_check_connect(struct obd_device *obd) GOTO(out_disc, rc); } - lmv_set_timeouts(obd); class_export_put(lmv->exp); lmv->connected = 1; easize = lmv_mds_md_size(lmv->desc.ld_tgt_count, LMV_MAGIC); - lmv_init_ea_size(obd->obd_self_export, easize, 0, 0, 0); - lmv_init_unlock(lmv); + lmv_init_ea_size(obd->obd_self_export, easize, 0); + mutex_unlock(&lmv->lmv_init_mutex); RETURN(0); out_disc: @@ -679,7 +591,7 @@ int lmv_check_connect(struct obd_device *obd) } } class_disconnect(lmv->exp); - lmv_init_unlock(lmv); + mutex_unlock(&lmv->lmv_init_mutex); RETURN(rc); } @@ -699,11 +611,11 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt) mdc_obd->obd_force = obd->obd_force; mdc_obd->obd_fail = obd->obd_fail; mdc_obd->obd_no_recov = obd->obd_no_recov; - } - if (lmv->targets_proc_entry != NULL) - lprocfs_remove_proc_entry(mdc_obd->obd_name, - lmv->targets_proc_entry); + if (lmv->targets_proc_entry != NULL) + lprocfs_remove_proc_entry(mdc_obd->obd_name, + lmv->targets_proc_entry); + } rc = obd_fid_fini(tgt->ltd_exp->exp_obd); if (rc) @@ -1254,9 +1166,7 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp, mdc_obd = class_exp2obd(tgt->ltd_exp); mdc_obd->obd_force = obddev->obd_force; err = obd_iocontrol(cmd, tgt->ltd_exp, len, karg, uarg); - if (err == -ENODATA && cmd == OBD_IOC_POLL_QUOTACHECK) { - RETURN(err); - } else if (err) { + if (err) { if (tgt->ltd_active) { CERROR("error: iocontrol MDC %s on MDT" " idx %d cmd %x: err = %d\n", @@ -1334,6 +1244,11 @@ static int lmv_placement_policy(struct obd_device *obd, RETURN(0); } + if (op_data->op_default_stripe_offset != -1) { + *mds = op_data->op_default_stripe_offset; + RETURN(0); + } + /** * If stripe_offset is provided during setdirstripe * (setdirstripe -i xx), xx MDS will be choosen. @@ -1441,23 +1356,22 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg) RETURN(-EINVAL); } - OBD_ALLOC(lmv->tgts, sizeof(*lmv->tgts) * 32); + lmv->tgts_size = 32U; + OBD_ALLOC(lmv->tgts, sizeof(*lmv->tgts) * lmv->tgts_size); if (lmv->tgts == NULL) RETURN(-ENOMEM); - lmv->tgts_size = 32; obd_str2uuid(&lmv->desc.ld_uuid, desc->ld_uuid.uuid); lmv->desc.ld_tgt_count = 0; lmv->desc.ld_active_tgt_count = 0; - lmv->max_cookiesize = 0; lmv->max_def_easize = 0; lmv->max_easize = 0; lmv->lmv_placement = PLACEMENT_CHAR_POLICY; spin_lock_init(&lmv->lmv_lock); - mutex_init(&lmv->init_mutex); + mutex_init(&lmv->lmv_init_mutex); -#ifdef LPROCFS +#ifdef CONFIG_PROC_FS obd->obd_vars = lprocfs_lmv_obd_vars; lprocfs_obd_setup(obd); lprocfs_alloc_md_stats(obd, 0); @@ -1499,7 +1413,7 @@ static int lmv_cleanup(struct obd_device *obd) RETURN(0); } -static int lmv_process_config(struct obd_device *obd, obd_count len, void *buf) +static int lmv_process_config(struct obd_device *obd, size_t len, void *buf) { struct lustre_cfg *lcfg = buf; struct obd_uuid obd_uuid; @@ -1586,9 +1500,7 @@ out_free_temp: return rc; } -static int lmv_getstatus(struct obd_export *exp, - struct lu_fid *fid, - struct obd_capa **pc) +static int lmv_getstatus(struct obd_export *exp, struct lu_fid *fid) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -1599,14 +1511,14 @@ static int lmv_getstatus(struct obd_export *exp, if (rc) RETURN(rc); - rc = md_getstatus(lmv->tgts[0]->ltd_exp, fid, pc); + rc = md_getstatus(lmv->tgts[0]->ltd_exp, fid); RETURN(rc); } static int lmv_getxattr(struct obd_export *exp, const struct lu_fid *fid, - struct obd_capa *oc, obd_valid valid, const char *name, - const char *input, int input_size, int output_size, - int flags, struct ptlrpc_request **request) + u64 valid, const char *name, + const char *input, int input_size, int output_size, + int flags, struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -1622,17 +1534,17 @@ static int lmv_getxattr(struct obd_export *exp, const struct lu_fid *fid, if (IS_ERR(tgt)) RETURN(PTR_ERR(tgt)); - rc = md_getxattr(tgt->ltd_exp, fid, oc, valid, name, input, - input_size, output_size, flags, request); + rc = md_getxattr(tgt->ltd_exp, fid, valid, name, input, + input_size, output_size, flags, request); - RETURN(rc); + RETURN(rc); } static int lmv_setxattr(struct obd_export *exp, const struct lu_fid *fid, - struct obd_capa *oc, obd_valid valid, const char *name, - const char *input, int input_size, int output_size, - int flags, __u32 suppgid, - struct ptlrpc_request **request) + u64 valid, const char *name, + const char *input, int input_size, int output_size, + int flags, __u32 suppgid, + struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -1648,11 +1560,11 @@ static int lmv_setxattr(struct obd_export *exp, const struct lu_fid *fid, if (IS_ERR(tgt)) RETURN(PTR_ERR(tgt)); - rc = md_setxattr(tgt->ltd_exp, fid, oc, valid, name, input, - input_size, output_size, flags, suppgid, - request); + rc = md_setxattr(tgt->ltd_exp, fid, valid, name, input, + input_size, output_size, flags, suppgid, + request); - RETURN(rc); + RETURN(rc); } static int lmv_getattr(struct obd_export *exp, struct md_op_data *op_data, @@ -1790,14 +1702,25 @@ lmv_locate_target_for_name(struct lmv_obd *lmv, struct lmv_stripe_md *lsm, struct lmv_tgt_desc *tgt; const struct lmv_oinfo *oinfo; - oinfo = lsm_name_to_stripe_info(lsm, name, namelen); - if (IS_ERR(oinfo)) - RETURN(ERR_CAST(oinfo)); - *fid = oinfo->lmo_fid; - *mds = oinfo->lmo_mds; - tgt = lmv_get_target(lmv, *mds, NULL); + if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_NAME_HASH)) { + if (cfs_fail_val >= lsm->lsm_md_stripe_count) + RETURN(ERR_PTR(-EBADF)); + oinfo = &lsm->lsm_md_oinfo[cfs_fail_val]; + } else { + oinfo = lsm_name_to_stripe_info(lsm, name, namelen); + if (IS_ERR(oinfo)) + RETURN(ERR_CAST(oinfo)); + } + + if (fid != NULL) + *fid = oinfo->lmo_fid; + if (mds != NULL) + *mds = oinfo->lmo_mds; - CDEBUG(D_INFO, "locate on mds %u "DFID"\n", *mds, PFID(fid)); + tgt = lmv_get_target(lmv, oinfo->lmo_mds, NULL); + + CDEBUG(D_INFO, "locate on mds %u "DFID"\n", oinfo->lmo_mds, + PFID(&oinfo->lmo_fid)); return tgt; } @@ -1868,9 +1791,9 @@ lmv_locate_mds(struct lmv_obd *lmv, struct md_op_data *op_data, } int lmv_create(struct obd_export *exp, struct md_op_data *op_data, - const void *data, int datalen, int mode, __u32 uid, - __u32 gid, cfs_cap_t cap_effective, __u64 rdev, - struct ptlrpc_request **request) + const void *data, size_t datalen, umode_t mode, uid_t uid, + gid_t gid, cfs_cap_t cap_effective, __u64 rdev, + struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -1890,20 +1813,23 @@ int lmv_create(struct obd_export *exp, struct md_op_data *op_data, RETURN(PTR_ERR(tgt)); CDEBUG(D_INODE, "CREATE name '%.*s' on "DFID" -> mds #%x\n", - op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1), - op_data->op_mds); + (int)op_data->op_namelen, op_data->op_name, + PFID(&op_data->op_fid1), op_data->op_mds); rc = lmv_fid_alloc(NULL, exp, &op_data->op_fid2, op_data); if (rc) RETURN(rc); + if (exp_connect_flags(exp) & OBD_CONNECT_DIR_STRIPE) { + /* Send the create request to the MDT where the object + * will be located */ + tgt = lmv_find_target(lmv, &op_data->op_fid2); + if (IS_ERR(tgt)) + RETURN(PTR_ERR(tgt)); - /* Send the create request to the MDT where the object - * will be located */ - tgt = lmv_find_target(lmv, &op_data->op_fid2); - if (IS_ERR(tgt)) - RETURN(PTR_ERR(tgt)); - - op_data->op_mds = tgt->ltd_idx; + op_data->op_mds = tgt->ltd_idx; + } else { + CDEBUG(D_CONFIG, "Server doesn't support striped dirs\n"); + } CDEBUG(D_INODE, "CREATE obj "DFID" -> mds #%x\n", PFID(&op_data->op_fid2), op_data->op_mds); @@ -1919,28 +1845,6 @@ int lmv_create(struct obd_export *exp, struct md_op_data *op_data, RETURN(rc); } -static int lmv_done_writing(struct obd_export *exp, - struct md_op_data *op_data, - struct md_open_data *mod) -{ - struct obd_device *obd = exp->exp_obd; - struct lmv_obd *lmv = &obd->u.lmv; - struct lmv_tgt_desc *tgt; - int rc; - ENTRY; - - rc = lmv_check_connect(obd); - if (rc) - RETURN(rc); - - tgt = lmv_find_target(lmv, &op_data->op_fid1); - if (IS_ERR(tgt)) - RETURN(PTR_ERR(tgt)); - - rc = md_done_writing(tgt->ltd_exp, op_data, mod); - RETURN(rc); -} - static int lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, const union ldlm_policy_data *policy, @@ -1964,7 +1868,7 @@ lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, if (IS_ERR(tgt)) RETURN(PTR_ERR(tgt)); - CDEBUG(D_INODE, "ENQUEUE '%s' on "DFID" -> mds #%d\n", + CDEBUG(D_INODE, "ENQUEUE '%s' on "DFID" -> mds #%u\n", LL_IT2STR(it), PFID(&op_data->op_fid1), tgt->ltd_idx); rc = md_enqueue(tgt->ltd_exp, einfo, policy, it, op_data, lockh, @@ -1994,8 +1898,8 @@ lmv_getattr_name(struct obd_export *exp,struct md_op_data *op_data, RETURN(PTR_ERR(tgt)); CDEBUG(D_INODE, "GETATTR_NAME for %*s on "DFID" -> mds #%d\n", - op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1), - tgt->ltd_idx); + (int)op_data->op_namelen, op_data->op_name, + PFID(&op_data->op_fid1), tgt->ltd_idx); rc = md_getattr_name(tgt->ltd_exp, op_data, preq); if (rc != 0) @@ -2037,7 +1941,7 @@ lmv_getattr_name(struct obd_export *exp,struct md_op_data *op_data, static int lmv_early_cancel(struct obd_export *exp, struct lmv_tgt_desc *tgt, struct md_op_data *op_data, - int op_tgt, ldlm_mode_t mode, int bits, int flag) + __u32 op_tgt, ldlm_mode_t mode, int bits, int flag) { struct lu_fid *fid = md_op_data_fid(op_data, flag); struct obd_device *obd = exp->exp_obd; @@ -2091,7 +1995,7 @@ static int lmv_link(struct obd_export *exp, struct md_op_data *op_data, LASSERT(op_data->op_namelen != 0); CDEBUG(D_INODE, "LINK "DFID":%*s to "DFID"\n", - PFID(&op_data->op_fid2), op_data->op_namelen, + PFID(&op_data->op_fid2), (int)op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1)); op_data->op_fsuid = from_kuid(&init_user_ns, current_fsuid()); @@ -2128,21 +2032,25 @@ static int lmv_link(struct obd_export *exp, struct md_op_data *op_data, } static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data, - const char *old, int oldlen, const char *new, int newlen, - struct ptlrpc_request **request) + const char *old, size_t oldlen, + const char *new, size_t newlen, + struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; struct lmv_tgt_desc *src_tgt; + struct lmv_tgt_desc *tgt_tgt; + struct obd_export *target_exp; + struct mdt_body *body; int rc; ENTRY; LASSERT(oldlen != 0); CDEBUG(D_INODE, "RENAME %.*s in "DFID":%d to %.*s in "DFID":%d\n", - oldlen, old, PFID(&op_data->op_fid1), + (int)oldlen, old, PFID(&op_data->op_fid1), op_data->op_mea1 ? op_data->op_mea1->lsm_md_stripe_count : 0, - newlen, new, PFID(&op_data->op_fid2), + (int)newlen, new, PFID(&op_data->op_fid2), op_data->op_mea2 ? op_data->op_mea2->lsm_md_stripe_count : 0); rc = lmv_check_connect(obd); @@ -2155,10 +2063,29 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data, if (op_data->op_cli_flags & CLI_MIGRATE) { LASSERTF(fid_is_sane(&op_data->op_fid3), "invalid FID "DFID"\n", PFID(&op_data->op_fid3)); + + if (op_data->op_mea1 != NULL) { + struct lmv_stripe_md *lsm = op_data->op_mea1; + struct lmv_tgt_desc *tmp; + + /* Fix the parent fid for striped dir */ + tmp = lmv_locate_target_for_name(lmv, lsm, old, + oldlen, + &op_data->op_fid1, + NULL); + if (IS_ERR(tmp)) + RETURN(PTR_ERR(tmp)); + } + rc = lmv_fid_alloc(NULL, exp, &op_data->op_fid2, op_data); - if (rc) + if (rc != 0) RETURN(rc); - src_tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid3); + + src_tgt = lmv_find_target(lmv, &op_data->op_fid3); + if (IS_ERR(src_tgt)) + RETURN(PTR_ERR(src_tgt)); + + target_exp = src_tgt->ltd_exp; } else { if (op_data->op_mea1 != NULL) { struct lmv_stripe_md *lsm = op_data->op_mea1; @@ -2167,29 +2094,29 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data, oldlen, &op_data->op_fid1, &op_data->op_mds); - if (IS_ERR(src_tgt)) - RETURN(PTR_ERR(src_tgt)); } else { src_tgt = lmv_find_target(lmv, &op_data->op_fid1); - if (IS_ERR(src_tgt)) - RETURN(PTR_ERR(src_tgt)); - - op_data->op_mds = src_tgt->ltd_idx; } + if (IS_ERR(src_tgt)) + RETURN(PTR_ERR(src_tgt)); + - if (op_data->op_mea2) { + if (op_data->op_mea2 != NULL) { struct lmv_stripe_md *lsm = op_data->op_mea2; - const struct lmv_oinfo *oinfo; - oinfo = lsm_name_to_stripe_info(lsm, new, newlen); - if (IS_ERR(oinfo)) - RETURN(PTR_ERR(oinfo)); + tgt_tgt = lmv_locate_target_for_name(lmv, lsm, new, + newlen, + &op_data->op_fid2, + &op_data->op_mds); + } else { + tgt_tgt = lmv_find_target(lmv, &op_data->op_fid2); - op_data->op_fid2 = oinfo->lmo_fid; } + if (IS_ERR(tgt_tgt)) + RETURN(PTR_ERR(tgt_tgt)); + + target_exp = tgt_tgt->ltd_exp; } - if (IS_ERR(src_tgt)) - RETURN(PTR_ERR(src_tgt)); /* * LOOKUP lock on src child (fid3) should also be cancelled for @@ -2231,27 +2158,56 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data, RETURN(rc); } +retry_rename: /* * Cancel all the locks on tgt child (fid4). */ - if (fid_is_sane(&op_data->op_fid4)) + if (fid_is_sane(&op_data->op_fid4)) { + struct lmv_tgt_desc *tgt; + rc = lmv_early_cancel(exp, NULL, op_data, src_tgt->ltd_idx, LCK_EX, MDS_INODELOCK_FULL, MF_MDC_CANCEL_FID4); + if (rc != 0) + RETURN(rc); - CDEBUG(D_INODE, DFID":m%d to "DFID"\n", PFID(&op_data->op_fid1), - op_data->op_mds, PFID(&op_data->op_fid2)); + tgt = lmv_find_target(lmv, &op_data->op_fid4); + if (IS_ERR(tgt)) + RETURN(PTR_ERR(tgt)); - rc = md_rename(src_tgt->ltd_exp, op_data, old, oldlen, new, newlen, + /* Since the target child might be destroyed, and it might + * become orphan, and we can only check orphan on the local + * MDT right now, so we send rename request to the MDT where + * target child is located. If target child does not exist, + * then it will send the request to the target parent */ + target_exp = tgt->ltd_exp; + } + + rc = md_rename(target_exp, op_data, old, oldlen, new, newlen, request); - RETURN(rc); + if (rc != 0 && rc != -EXDEV) + RETURN(rc); + + body = req_capsule_server_get(&(*request)->rq_pill, &RMF_MDT_BODY); + if (body == NULL) + RETURN(-EPROTO); + + /* Not cross-ref case, just get out of here. */ + if (likely(!(body->mbo_valid & OBD_MD_MDS))) + RETURN(rc); + + CDEBUG(D_INODE, "%s: try rename to another MDT for "DFID"\n", + exp->exp_obd->obd_name, PFID(&body->mbo_fid1)); + + op_data->op_fid4 = body->mbo_fid1; + ptlrpc_req_finished(*request); + *request = NULL; + goto retry_rename; } static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data, - void *ea, int ealen, void *ea2, int ea2len, - struct ptlrpc_request **request, - struct md_open_data **mod) + void *ea, size_t ealen, struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -2271,14 +2227,13 @@ static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data, if (IS_ERR(tgt)) RETURN(PTR_ERR(tgt)); - rc = md_setattr(tgt->ltd_exp, op_data, ea, ealen, ea2, - ea2len, request, mod); + rc = md_setattr(tgt->ltd_exp, op_data, ea, ealen, request); RETURN(rc); } static int lmv_fsync(struct obd_export *exp, const struct lu_fid *fid, - struct obd_capa *oc, struct ptlrpc_request **request) + struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -2294,7 +2249,7 @@ static int lmv_fsync(struct obd_export *exp, const struct lu_fid *fid, if (IS_ERR(tgt)) RETURN(PTR_ERR(tgt)); - rc = md_fsync(tgt->ltd_exp, fid, oc, request); + rc = md_fsync(tgt->ltd_exp, fid, request); RETURN(rc); } @@ -2358,7 +2313,6 @@ static int lmv_get_min_striped_entry(struct obd_export *exp, /* op_data will be shared by each stripe, so we need * reset these value for each stripe */ - op_data->op_stripe_offset = i; op_data->op_fid1 = lsm->lsm_md_oinfo[i].lmo_fid; op_data->op_fid2 = lsm->lsm_md_oinfo[i].lmo_fid; op_data->op_data = lsm->lsm_md_oinfo[i].lmo_root; @@ -2478,7 +2432,7 @@ static int lmv_read_striped_page(struct obd_export *exp, int ent_idx = 0; struct lu_dirent *min_ent = NULL; struct lu_dirent *last_ent; - int left_bytes; + size_t left_bytes; int rc; ENTRY; @@ -2679,7 +2633,7 @@ retry_unlink: * name from stripe 0, but migrating dir is already handled * inside lmv_locate_target_for_name(), so we only check * unknown hash type directory here */ - if (!lmv_is_known_hash_type(lsm)) { + if (!lmv_is_known_hash_type(lsm->lsm_md_hash_type)) { struct lmv_oinfo *oinfo; oinfo = &lsm->lsm_md_oinfo[stripe_index]; @@ -2732,7 +2686,7 @@ try_next_stripe: if (rc != 0) RETURN(rc); - CDEBUG(D_INODE, "unlink with fid="DFID"/"DFID" -> mds #%d\n", + CDEBUG(D_INODE, "unlink with fid="DFID"/"DFID" -> mds #%u\n", PFID(&op_data->op_fid1), PFID(&op_data->op_fid2), tgt->ltd_idx); rc = md_unlink(tgt->ltd_exp, op_data, request); @@ -2816,9 +2770,24 @@ static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage) RETURN(rc); } +/** + * Get by key a value associated with a LMV device. + * + * Dispatch request to lower-layer devices as needed. + * + * \param[in] env execution environment for this thread + * \param[in] exp export for the LMV device + * \param[in] keylen length of key identifier + * \param[in] key identifier of key to get value for + * \param[in] vallen size of \a val + * \param[out] val pointer to storage location for value + * \param[in] lsm optional striping metadata of object + * + * \retval 0 on success + * \retval negative negated errno on failure + */ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp, - __u32 keylen, void *key, __u32 *vallen, void *val, - struct lov_stripe_md *lsm) + __u32 keylen, void *key, __u32 *vallen, void *val) { struct obd_device *obd; struct lmv_obd *lmv; @@ -2850,14 +2819,12 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp, continue; if (!obd_get_info(env, tgt->ltd_exp, keylen, key, - vallen, val, NULL)) + vallen, val)) RETURN(0); } RETURN(-EINVAL); } else if (KEY_IS(KEY_MAX_EASIZE) || KEY_IS(KEY_DEFAULT_EASIZE) || - KEY_IS(KEY_MAX_COOKIESIZE) || - KEY_IS(KEY_DEFAULT_COOKIESIZE) || KEY_IS(KEY_CONN_DATA)) { rc = lmv_check_connect(obd); if (rc) @@ -2868,7 +2835,7 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp, * desc. */ rc = obd_get_info(env, lmv->tgts[0]->ltd_exp, keylen, key, - vallen, val, NULL); + vallen, val); if (!rc && KEY_IS(KEY_CONN_DATA)) exp->exp_connect_data = *(struct obd_connect_data *)val; RETURN(rc); @@ -2881,26 +2848,43 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp, RETURN(-EINVAL); } +/** + * Asynchronously set by key a value associated with a LMV device. + * + * Dispatch request to lower-layer devices as needed. + * + * \param[in] env execution environment for this thread + * \param[in] exp export for the LMV device + * \param[in] keylen length of key identifier + * \param[in] key identifier of key to store value for + * \param[in] vallen size of value to store + * \param[in] val pointer to data to be stored + * \param[in] set optional list of related ptlrpc requests + * + * \retval 0 on success + * \retval negative negated errno on failure + */ int lmv_set_info_async(const struct lu_env *env, struct obd_export *exp, - obd_count keylen, void *key, obd_count vallen, - void *val, struct ptlrpc_request_set *set) + __u32 keylen, void *key, __u32 vallen, void *val, + struct ptlrpc_request_set *set) { - struct lmv_tgt_desc *tgt = NULL; - struct obd_device *obd; - struct lmv_obd *lmv; - int rc = 0; - ENTRY; + struct lmv_tgt_desc *tgt = NULL; + struct obd_device *obd; + struct lmv_obd *lmv; + int rc = 0; + ENTRY; - obd = class_exp2obd(exp); - if (obd == NULL) { - CDEBUG(D_IOCTL, "Invalid client cookie "LPX64"\n", - exp->exp_handle.h_cookie); - RETURN(-EINVAL); - } - lmv = &obd->u.lmv; + obd = class_exp2obd(exp); + if (obd == NULL) { + CDEBUG(D_IOCTL, "Invalid client cookie "LPX64"\n", + exp->exp_handle.h_cookie); + RETURN(-EINVAL); + } + lmv = &obd->u.lmv; - if (KEY_IS(KEY_READ_ONLY) || KEY_IS(KEY_FLUSH_CTX)) { - int i, err = 0; + if (KEY_IS(KEY_READ_ONLY) || KEY_IS(KEY_FLUSH_CTX) || + KEY_IS(KEY_DEFAULT_EASIZE)) { + int i, err = 0; for (i = 0; i < lmv->desc.ld_tgt_count; i++) { tgt = lmv->tgts[i]; @@ -2908,101 +2892,17 @@ int lmv_set_info_async(const struct lu_env *env, struct obd_export *exp, if (tgt == NULL || tgt->ltd_exp == NULL) continue; - err = obd_set_info_async(env, tgt->ltd_exp, - keylen, key, vallen, val, set); - if (err && rc == 0) - rc = err; - } - - RETURN(rc); - } - - RETURN(-EINVAL); -} - -static int lmv_pack_md_v1(const struct lmv_stripe_md *lsm, - struct lmv_mds_md_v1 *lmm1) -{ - int cplen; - int i; - - lmm1->lmv_magic = cpu_to_le32(lsm->lsm_md_magic); - lmm1->lmv_stripe_count = cpu_to_le32(lsm->lsm_md_stripe_count); - lmm1->lmv_master_mdt_index = cpu_to_le32(lsm->lsm_md_master_mdt_index); - lmm1->lmv_hash_type = cpu_to_le32(lsm->lsm_md_hash_type); - cplen = strlcpy(lmm1->lmv_pool_name, lsm->lsm_md_pool_name, - sizeof(lmm1->lmv_pool_name)); - if (cplen >= sizeof(lmm1->lmv_pool_name)) - return -E2BIG; - - for (i = 0; i < lsm->lsm_md_stripe_count; i++) - fid_cpu_to_le(&lmm1->lmv_stripe_fids[i], - &lsm->lsm_md_oinfo[i].lmo_fid); - return 0; -} - -int lmv_pack_md(union lmv_mds_md **lmmp, const struct lmv_stripe_md *lsm, - int stripe_count) -{ - int lmm_size = 0; - bool allocated = false; - int rc = 0; - ENTRY; - - LASSERT(lmmp != NULL); - /* Free lmm */ - if (*lmmp != NULL && lsm == NULL) { - int stripe_count; - - stripe_count = lmv_mds_md_stripe_count_get(*lmmp); - lmm_size = lmv_mds_md_size(stripe_count, - le32_to_cpu((*lmmp)->lmv_magic)); - if (lmm_size == 0) - RETURN(-EINVAL); - OBD_FREE(*lmmp, lmm_size); - *lmmp = NULL; - RETURN(0); - } - - /* Alloc lmm */ - if (*lmmp == NULL && lsm == NULL) { - lmm_size = lmv_mds_md_size(stripe_count, LMV_MAGIC); - LASSERT(lmm_size > 0); - OBD_ALLOC(*lmmp, lmm_size); - if (*lmmp == NULL) - RETURN(-ENOMEM); - lmv_mds_md_stripe_count_set(*lmmp, stripe_count); - (*lmmp)->lmv_magic = cpu_to_le32(LMV_MAGIC); - RETURN(lmm_size); - } - - /* pack lmm */ - LASSERT(lsm != NULL); - lmm_size = lmv_mds_md_size(lsm->lsm_md_stripe_count, lsm->lsm_md_magic); - if (*lmmp == NULL) { - OBD_ALLOC(*lmmp, lmm_size); - if (*lmmp == NULL) - RETURN(-ENOMEM); - allocated = true; - } - - switch (lsm->lsm_md_magic) { - case LMV_MAGIC_V1: - rc = lmv_pack_md_v1(lsm, &(*lmmp)->lmv_md_v1); - break; - default: - rc = -EINVAL; - break; - } + err = obd_set_info_async(env, tgt->ltd_exp, + keylen, key, vallen, val, set); + if (err && rc == 0) + rc = err; + } - if (rc != 0 && allocated) { - OBD_FREE(*lmmp, lmm_size); - *lmmp = NULL; + RETURN(rc); } - RETURN(lmm_size); + RETURN(-EINVAL); } -EXPORT_SYMBOL(lmv_pack_md); static int lmv_unpack_md_v1(struct obd_export *exp, struct lmv_stripe_md *lsm, const struct lmv_mds_md_v1 *lmm1) @@ -3048,8 +2948,8 @@ static int lmv_unpack_md_v1(struct obd_export *exp, struct lmv_stripe_md *lsm, RETURN(rc); } -int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp, - const union lmv_mds_md *lmm, int stripe_count) +static int lmv_unpackmd(struct obd_export *exp, struct lmv_stripe_md **lsmp, + const union lmv_mds_md *lmm, size_t lmm_size) { struct lmv_stripe_md *lsm; int lsm_size; @@ -3077,17 +2977,6 @@ int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp, RETURN(0); } - /* Alloc memmd */ - if (lsm == NULL && lmm == NULL) { - lsm_size = lmv_stripe_md_size(stripe_count); - OBD_ALLOC(lsm, lsm_size); - if (lsm == NULL) - RETURN(-ENOMEM); - lsm->lsm_md_stripe_count = stripe_count; - *lsmp = lsm; - RETURN(0); - } - if (le32_to_cpu(lmm->lmv_magic) == LMV_MAGIC_STRIPE) RETURN(-EPERM); @@ -3137,45 +3026,12 @@ int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp, RETURN(lsm_size); } -int lmv_alloc_memmd(struct lmv_stripe_md **lsmp, int stripes) -{ - return lmv_unpack_md(NULL, lsmp, NULL, stripes); -} -EXPORT_SYMBOL(lmv_alloc_memmd); - void lmv_free_memmd(struct lmv_stripe_md *lsm) { - lmv_unpack_md(NULL, &lsm, NULL, 0); + lmv_unpackmd(NULL, &lsm, NULL, 0); } EXPORT_SYMBOL(lmv_free_memmd); -int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp, - struct lov_mds_md *lmm, int disk_len) -{ - return lmv_unpack_md(exp, (struct lmv_stripe_md **)lsmp, - (union lmv_mds_md *)lmm, disk_len); -} - -int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp, - struct lov_stripe_md *lsm) -{ - struct obd_device *obd = exp->exp_obd; - struct lmv_obd *lmv_obd = &obd->u.lmv; - const struct lmv_stripe_md *lmv = (struct lmv_stripe_md *)lsm; - int stripe_count; - - if (lmmp == NULL) { - if (lsm != NULL) - stripe_count = lmv->lsm_md_stripe_count; - else - stripe_count = lmv_obd->desc.ld_tgt_count; - - return lmv_mds_md_size(stripe_count, LMV_MAGIC_V1); - } - - return lmv_pack_md((union lmv_mds_md **)lmmp, lmv, 0); -} - static int lmv_cancel_unused(struct obd_export *exp, const struct lu_fid *fid, ldlm_policy_data_t *policy, ldlm_mode_t mode, ldlm_cancel_flags_t flags, void *opaque) @@ -3320,10 +3176,8 @@ int lmv_clear_open_replay_data(struct obd_export *exp, RETURN(md_clear_open_replay_data(tgt->ltd_exp, och)); } -static int lmv_get_remote_perm(struct obd_export *exp, - const struct lu_fid *fid, - struct obd_capa *oc, __u32 suppgid, - struct ptlrpc_request **request) +static int lmv_get_remote_perm(struct obd_export *exp, const struct lu_fid *fid, + u32 suppgid, struct ptlrpc_request **request) { struct obd_device *obd = exp->exp_obd; struct lmv_obd *lmv = &obd->u.lmv; @@ -3339,40 +3193,8 @@ static int lmv_get_remote_perm(struct obd_export *exp, if (IS_ERR(tgt)) RETURN(PTR_ERR(tgt)); - rc = md_get_remote_perm(tgt->ltd_exp, fid, oc, suppgid, request); - RETURN(rc); -} - -static int lmv_renew_capa(struct obd_export *exp, struct obd_capa *oc, - renew_capa_cb_t cb) -{ - struct obd_device *obd = exp->exp_obd; - struct lmv_obd *lmv = &obd->u.lmv; - struct lmv_tgt_desc *tgt; - int rc; - ENTRY; - - rc = lmv_check_connect(obd); - if (rc) - RETURN(rc); - - tgt = lmv_find_target(lmv, &oc->c_capa.lc_fid); - if (IS_ERR(tgt)) - RETURN(PTR_ERR(tgt)); - - rc = md_renew_capa(tgt->ltd_exp, oc, cb); - RETURN(rc); -} - -int lmv_unpack_capa(struct obd_export *exp, struct ptlrpc_request *req, - const struct req_msg_field *field, struct obd_capa **oc) -{ - struct lmv_obd *lmv = &exp->exp_obd->u.lmv; - struct lmv_tgt_desc *tgt = lmv->tgts[0]; - - if (tgt == NULL || tgt->ltd_exp == NULL) - RETURN(-EINVAL); - return md_unpack_capa(tgt->ltd_exp, req, field, oc); + rc = md_get_remote_perm(tgt->ltd_exp, fid, suppgid, request); + RETURN(rc); } int lmv_intent_getattr_async(struct obd_export *exp, @@ -3488,51 +3310,27 @@ int lmv_quotactl(struct obd_device *unused, struct obd_export *exp, RETURN(rc); } -int lmv_quotacheck(struct obd_device *unused, struct obd_export *exp, - struct obd_quotactl *oqctl) -{ - struct obd_device *obd = class_exp2obd(exp); - struct lmv_obd *lmv = &obd->u.lmv; - struct lmv_tgt_desc *tgt; - __u32 i; - int rc = 0; - ENTRY; - - for (i = 0; i < lmv->desc.ld_tgt_count; i++) { - int err; - tgt = lmv->tgts[i]; - if (tgt == NULL || tgt->ltd_exp == NULL || !tgt->ltd_active) { - CERROR("lmv idx %d inactive\n", i); - RETURN(-EIO); - } - - err = obd_quotacheck(tgt->ltd_exp, oqctl); - if (err && !rc) - rc = err; - } - - RETURN(rc); -} - -int lmv_update_lsm_md(struct obd_export *exp, struct lmv_stripe_md *lsm, - struct mdt_body *body, ldlm_blocking_callback cb_blocking) -{ - return lmv_revalidate_slaves(exp, body, lsm, cb_blocking, 0); -} - -int lmv_merge_attr(struct obd_export *exp, const struct lmv_stripe_md *lsm, - struct cl_attr *attr) +static int lmv_merge_attr(struct obd_export *exp, + const struct lmv_stripe_md *lsm, + struct cl_attr *attr, + ldlm_blocking_callback cb_blocking) { + int rc; int i; + rc = lmv_revalidate_slaves(exp, lsm, cb_blocking, 0); + if (rc < 0) + return rc; + for (i = 0; i < lsm->lsm_md_stripe_count; i++) { struct inode *inode = lsm->lsm_md_oinfo[i].lmo_root; - CDEBUG(D_INFO, ""DFID" size %llu, nlink %u, atime %lu ctime" - "%lu, mtime %lu.\n", PFID(&lsm->lsm_md_oinfo[i].lmo_fid), - i_size_read(inode), inode->i_nlink, - LTIME_S(inode->i_atime), LTIME_S(inode->i_ctime), - LTIME_S(inode->i_mtime)); + CDEBUG(D_INFO, ""DFID" size %llu, blocks %llu nlink %u," + " atime %lu ctime %lu, mtime %lu.\n", + PFID(&lsm->lsm_md_oinfo[i].lmo_fid), + i_size_read(inode), (unsigned long long)inode->i_blocks, + inode->i_nlink, LTIME_S(inode->i_atime), + LTIME_S(inode->i_ctime), LTIME_S(inode->i_mtime)); /* for slave stripe, it needs to subtract nlink for . and .. */ if (i != 0) @@ -3541,6 +3339,7 @@ int lmv_merge_attr(struct obd_export *exp, const struct lmv_stripe_md *lsm, attr->cat_nlink = inode->i_nlink; attr->cat_size += i_size_read(inode); + attr->cat_blocks += inode->i_blocks; if (attr->cat_atime < LTIME_S(inode->i_atime)) attr->cat_atime = LTIME_S(inode->i_atime); @@ -3565,12 +3364,9 @@ struct obd_ops lmv_obd_ops = { .o_statfs = lmv_statfs, .o_get_info = lmv_get_info, .o_set_info_async = lmv_set_info_async, - .o_packmd = lmv_packmd, - .o_unpackmd = lmv_unpackmd, .o_notify = lmv_notify, .o_get_uuid = lmv_get_uuid, .o_iocontrol = lmv_iocontrol, - .o_quotacheck = lmv_quotacheck, .o_quotactl = lmv_quotactl }; @@ -3580,7 +3376,6 @@ struct md_ops lmv_md_ops = { .m_find_cbdata = lmv_find_cbdata, .m_close = lmv_close, .m_create = lmv_create, - .m_done_writing = lmv_done_writing, .m_enqueue = lmv_enqueue, .m_getattr = lmv_getattr, .m_getxattr = lmv_getxattr, @@ -3599,16 +3394,14 @@ struct md_ops lmv_md_ops = { .m_lock_match = lmv_lock_match, .m_get_lustre_md = lmv_get_lustre_md, .m_free_lustre_md = lmv_free_lustre_md, - .m_update_lsm_md = lmv_update_lsm_md, .m_merge_attr = lmv_merge_attr, .m_set_open_replay_data = lmv_set_open_replay_data, .m_clear_open_replay_data = lmv_clear_open_replay_data, - .m_renew_capa = lmv_renew_capa, - .m_unpack_capa = lmv_unpack_capa, .m_get_remote_perm = lmv_get_remote_perm, .m_intent_getattr_async = lmv_intent_getattr_async, .m_revalidate_lock = lmv_revalidate_lock, .m_get_fid_from_lsm = lmv_get_fid_from_lsm, + .m_unpackmd = lmv_unpackmd, }; int __init lmv_init(void)