static int lmv_check_connect(struct obd_device *obd);
-static void lmv_activate_target(struct lmv_obd *lmv,
- struct lmv_tgt_desc *tgt,
- int activate)
+void lmv_activate_target(struct lmv_obd *lmv, struct lmv_tgt_desc *tgt,
+ int activate)
{
if (tgt->ltd_active == activate)
return;
int rc;
ENTRY;
- mdc_obd = class_find_client_obd(&tgt->ltd_uuid, LUSTRE_MDC_NAME,
- &obd->obd_uuid);
- if (!mdc_obd) {
- CERROR("target %s not attached\n", tgt->ltd_uuid.uuid);
- RETURN(-EINVAL);
- }
+ mdc_obd = class_find_client_obd(&tgt->ltd_uuid, LUSTRE_MDC_NAME,
+ &obd->obd_uuid);
+ if (!mdc_obd) {
+ CERROR("target %s not attached\n", tgt->ltd_uuid.uuid);
+ RETURN(-EINVAL);
+ }
CDEBUG(D_CONFIG, "connect to %s(%s) - %s, %s\n",
mdc_obd->obd_name, mdc_obd->obd_uuid.uuid,
tgt->ltd_uuid.uuid, obd->obd_uuid.uuid);
- if (!mdc_obd->obd_set_up) {
- CERROR("target %s is not set up\n", tgt->ltd_uuid.uuid);
- RETURN(-EINVAL);
- }
+ if (!mdc_obd->obd_set_up) {
+ CERROR("target %s is not set up\n", tgt->ltd_uuid.uuid);
+ RETURN(-EINVAL);
+ }
rc = obd_connect(NULL, &mdc_exp, mdc_obd, &obd->obd_uuid,
&lmv->conn_data, lmv->lmv_cache);
if (rc)
RETURN(rc);
- target.ft_srv = NULL;
- target.ft_exp = mdc_exp;
- target.ft_idx = tgt->ltd_idx;
+ target.ft_srv = NULL;
+ target.ft_exp = mdc_exp;
+ target.ft_idx = tgt->ltd_index;
- fld_client_add_target(&lmv->lmv_fld, &target);
+ fld_client_add_target(&lmv->lmv_fld, &target);
- rc = obd_register_observer(mdc_obd, obd);
- if (rc) {
- obd_disconnect(mdc_exp);
- CERROR("target %s register_observer error %d\n",
- tgt->ltd_uuid.uuid, rc);
- RETURN(rc);
- }
+ rc = obd_register_observer(mdc_obd, obd);
+ if (rc) {
+ obd_disconnect(mdc_exp);
+ CERROR("target %s register_observer error %d\n",
+ tgt->ltd_uuid.uuid, rc);
+ RETURN(rc);
+ }
if (obd->obd_observer) {
/*
md_init_ea_size(tgt->ltd_exp, lmv->max_easize, lmv->max_def_easize);
+ rc = lqos_add_tgt(&lmv->lmv_qos, tgt);
+ if (rc) {
+ obd_disconnect(mdc_exp);
+ RETURN(rc);
+ }
+
CDEBUG(D_CONFIG, "Connected to %s(%s) successfully (%d)\n",
mdc_obd->obd_name, mdc_obd->obd_uuid.uuid,
atomic_read(&obd->obd_refcount));
+ lmv_statfs_check_update(obd, tgt);
+
if (lmv->lmv_tgts_kobj)
/* Even if we failed to create the link, that's fine */
rc = sysfs_create_link(lmv->lmv_tgts_kobj,
if (lmv->tgts[index] == NULL)
return;
+ lqos_del_tgt(&lmv->lmv_qos, lmv->tgts[index]);
+
OBD_FREE_PTR(lmv->tgts[index]);
lmv->tgts[index] = NULL;
return;
__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;
- int rc = 0;
- ENTRY;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int orig_tgt_count = 0;
+ int rc = 0;
+
+ ENTRY;
CDEBUG(D_CONFIG, "Target uuid: %s. index %d\n", uuidp->uuid, index);
mdc_obd = class_find_client_obd(uuidp, LUSTRE_MDC_NAME,
}
mutex_init(&tgt->ltd_fid_mutex);
- tgt->ltd_idx = index;
+ tgt->ltd_index = index;
tgt->ltd_uuid = *uuidp;
tgt->ltd_active = 0;
lmv->tgts[index] = tgt;
RETURN(-EINVAL);
/* only files on same MDT can have their layouts swapped */
- if (tgt1->ltd_idx != tgt2->ltd_idx)
+ if (tgt1->ltd_index != tgt2->ltd_index)
RETURN(-EPERM);
rc = obd_iocontrol(cmd, tgt1->ltd_exp, len, karg, uarg);
/**
* This is _inode_ placement policy function (not name).
*/
-static int lmv_placement_policy(struct obd_device *obd,
- struct md_op_data *op_data, u32 *mds)
+static u32 lmv_placement_policy(struct obd_device *obd,
+ struct md_op_data *op_data)
{
- struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_obd *lmv = &obd->u.lmv;
struct lmv_user_md *lum;
+ u32 mdt;
ENTRY;
- LASSERT(mds != NULL);
-
- if (lmv->desc.ld_tgt_count == 1) {
- *mds = 0;
+ if (lmv->desc.ld_tgt_count == 1)
RETURN(0);
- }
lum = op_data->op_data;
- /* Choose MDS by
+ /*
+ * Choose MDT by
* 1. See if the stripe offset is specified by lum.
- * 2. Then check if there is default stripe offset.
- * 3. Finally choose MDS by name hash if the parent
+ * 2. If parent has default LMV, and its hash type is "space", choose
+ * MDT with QoS. (see lmv_locate_tgt_qos()).
+ * 3. Then check if default LMV stripe offset is not -1.
+ * 4. Finally choose MDS by name hash if the parent
* is striped directory. (see lmv_locate_tgt()).
*
* presently explicit MDT location is not supported
if (op_data->op_cli_flags & CLI_SET_MEA && lum != NULL &&
le32_to_cpu(lum->lum_magic != LMV_MAGIC_FOREIGN) &&
le32_to_cpu(lum->lum_stripe_offset) != (__u32)-1) {
- *mds = le32_to_cpu(lum->lum_stripe_offset);
- } else if (op_data->op_default_stripe_offset != (__u32)-1) {
- *mds = op_data->op_default_stripe_offset;
- op_data->op_mds = *mds;
- /* Correct the stripe offset in lum */
- if (lum != NULL &&
- le32_to_cpu(lum->lum_magic != LMV_MAGIC_FOREIGN))
- lum->lum_stripe_offset = cpu_to_le32(*mds);
+ mdt = le32_to_cpu(lum->lum_stripe_offset);
+ } else if (op_data->op_code == LUSTRE_OPC_MKDIR &&
+ !lmv_dir_striped(op_data->op_mea1) &&
+ lmv_dir_space_hashed(op_data->op_default_mea1)) {
+ mdt = op_data->op_mds;
+ } else if (op_data->op_code == LUSTRE_OPC_MKDIR &&
+ op_data->op_default_mea1 &&
+ op_data->op_default_mea1->lsm_md_master_mdt_index !=
+ (__u32)-1) {
+ mdt = op_data->op_default_mea1->lsm_md_master_mdt_index;
+ op_data->op_mds = mdt;
} else {
- *mds = op_data->op_mds;
+ mdt = op_data->op_mds;
}
- RETURN(0);
+ RETURN(mdt);
}
int __lmv_fid_alloc(struct lmv_obd *lmv, struct lu_fid *fid, u32 mds)
rc = 0;
}
- EXIT;
+ EXIT;
out:
mutex_unlock(&tgt->ltd_fid_mutex);
- return rc;
+ return rc;
}
int lmv_fid_alloc(const struct lu_env *env, struct obd_export *exp,
struct lu_fid *fid, struct md_op_data *op_data)
{
- struct obd_device *obd = class_exp2obd(exp);
- struct lmv_obd *lmv = &obd->u.lmv;
- u32 mds = 0;
- int rc;
- ENTRY;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lmv_obd *lmv = &obd->u.lmv;
+ u32 mds;
+ int rc;
- LASSERT(op_data != NULL);
- LASSERT(fid != NULL);
+ ENTRY;
- rc = lmv_placement_policy(obd, op_data, &mds);
- if (rc) {
- CERROR("Can't get target for allocating fid, "
- "rc %d\n", rc);
- RETURN(rc);
- }
+ LASSERT(op_data != NULL);
+ LASSERT(fid != NULL);
- rc = __lmv_fid_alloc(lmv, fid, mds);
- if (rc) {
- CERROR("Can't alloc new fid, rc %d\n", rc);
- RETURN(rc);
- }
+ mds = lmv_placement_policy(obd, op_data);
- RETURN(rc);
+ rc = __lmv_fid_alloc(lmv, fid, mds);
+ if (rc)
+ CERROR("Can't alloc new fid, rc %d\n", rc);
+
+ RETURN(rc);
}
static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
{
- struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_obd *lmv = &obd->u.lmv;
struct lmv_desc *desc;
- int rc;
+ struct lnet_process_id lnet_id;
+ int i = 0;
+ int rc;
+
ENTRY;
if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1) {
obd_str2uuid(&lmv->desc.ld_uuid, desc->ld_uuid.uuid);
lmv->desc.ld_tgt_count = 0;
lmv->desc.ld_active_tgt_count = 0;
+ lmv->desc.ld_qos_maxage = LMV_DESC_QOS_MAXAGE_DEFAULT;
lmv->max_def_easize = 0;
lmv->max_easize = 0;
spin_lock_init(&lmv->lmv_lock);
mutex_init(&lmv->lmv_init_mutex);
+ /* Set up allocation policy (QoS and RR) */
+ INIT_LIST_HEAD(&lmv->lmv_qos.lq_svr_list);
+ init_rwsem(&lmv->lmv_qos.lq_rw_sem);
+ lmv->lmv_qos.lq_dirty = 1;
+ lmv->lmv_qos.lq_rr.lqr_dirty = 1;
+ lmv->lmv_qos.lq_reset = 1;
+ /* Default priority is toward free space balance */
+ lmv->lmv_qos.lq_prio_free = 232;
+ /* Default threshold for rr (roughly 17%) */
+ lmv->lmv_qos.lq_threshold_rr = 43;
+
+ /*
+ * initialize rr_index to lower 32bit of netid, so that client
+ * can distribute subdirs evenly from the beginning.
+ */
+ while (LNetGetId(i++, &lnet_id) != -ENOENT) {
+ if (LNET_NETTYP(LNET_NIDNET(lnet_id.nid)) != LOLND) {
+ lmv->lmv_qos_rr_index = (u32)lnet_id.nid;
+ break;
+ }
+ }
+
rc = lmv_tunables_init(obd);
if (rc)
CWARN("%s: error adding LMV sysfs/debugfs files: rc = %d\n",
return rc;
}
+static int lmv_statfs_update(void *cookie, int rc)
+{
+ struct obd_info *oinfo = cookie;
+ struct obd_device *obd = oinfo->oi_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt = oinfo->oi_tgt;
+ struct obd_statfs *osfs = oinfo->oi_osfs;
+
+ /*
+ * NB: don't deactivate TGT upon error, because we may not trigger async
+ * statfs any longer, then there is no chance to activate TGT.
+ */
+ if (!rc) {
+ spin_lock(&lmv->lmv_lock);
+ tgt->ltd_statfs = *osfs;
+ tgt->ltd_statfs_age = ktime_get_seconds();
+ spin_unlock(&lmv->lmv_lock);
+ lmv->lmv_qos.lq_dirty = 1;
+ }
+
+ return rc;
+}
+
+/* update tgt statfs async if it's ld_qos_maxage old */
+int lmv_statfs_check_update(struct obd_device *obd, struct lmv_tgt_desc *tgt)
+{
+ struct obd_info oinfo = {
+ .oi_obd = obd,
+ .oi_tgt = tgt,
+ .oi_cb_up = lmv_statfs_update,
+ };
+ int rc;
+
+ if (ktime_get_seconds() - tgt->ltd_statfs_age <
+ obd->u.lmv.desc.ld_qos_maxage)
+ return 0;
+
+ rc = obd_statfs_async(tgt->ltd_exp, &oinfo, 0, NULL);
+
+ return rc;
+}
+
static int lmv_get_root(struct obd_export *exp, const char *fileset,
struct lu_fid *fid)
{
RETURN(PTR_ERR(tgt));
if (op_data->op_flags & MF_GET_MDT_IDX) {
- op_data->op_mds = tgt->ltd_idx;
+ op_data->op_mds = tgt->ltd_index;
RETURN(0);
}
RETURN(rc);
}
-struct lmv_tgt_desc*
-__lmv_locate_tgt(struct lmv_obd *lmv, struct lmv_stripe_md *lsm,
- const char *name, int namelen, struct lu_fid *fid, u32 *mds,
- bool post_migrate)
+static struct lmv_tgt_desc *
+lmv_locate_tgt_by_name(struct lmv_obd *lmv, struct lmv_stripe_md *lsm,
+ const char *name, int namelen, struct lu_fid *fid,
+ __u32 *mds, bool post_migrate)
{
struct lmv_tgt_desc *tgt;
const struct lmv_oinfo *oinfo;
- if (lsm == NULL || namelen == 0) {
+ if (!lmv_dir_striped(lsm) || !namelen) {
tgt = lmv_find_target(lmv, fid);
if (IS_ERR(tgt))
return tgt;
- LASSERT(mds);
- *mds = tgt->ltd_idx;
+ *mds = tgt->ltd_index;
return tgt;
}
return ERR_CAST(oinfo);
}
- if (fid != NULL)
- *fid = oinfo->lmo_fid;
- if (mds != NULL)
- *mds = oinfo->lmo_mds;
-
+ *fid = oinfo->lmo_fid;
+ *mds = oinfo->lmo_mds;
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));
+ CDEBUG(D_INODE, "locate MDT %u parent "DFID"\n", *mds, PFID(fid));
return tgt;
}
-
/**
- * Locate mdt by fid or name
+ * Locate MDT of op_data->op_fid1
*
* For striped directory, it will locate the stripe by name hash, if hash_type
* is unknown, it will return the stripe specified by 'op_data->op_stripe_index'
* which is set outside, and if dir is migrating, 'op_data->op_post_migrate'
* indicates whether old or new layout is used to locate.
*
- * For normal direcotry, it will locate MDS by FID directly.
+ * For plain direcotry, normally it will locate MDT by FID, but if this
+ * directory has default LMV, and its hash type is "space", locate MDT with QoS.
*
* \param[in] lmv LMV device
* \param[in] op_data client MD stack parameters, name, namelen
* mds_num etc.
- * \param[in] fid object FID used to locate MDS.
*
* retval pointer to the lmv_tgt_desc if succeed.
* ERR_PTR(errno) if failed.
*/
-struct lmv_tgt_desc*
-lmv_locate_tgt(struct lmv_obd *lmv, struct md_op_data *op_data,
- struct lu_fid *fid)
+struct lmv_tgt_desc *
+lmv_locate_tgt(struct lmv_obd *lmv, struct md_op_data *op_data)
{
struct lmv_stripe_md *lsm = op_data->op_mea1;
struct lmv_oinfo *oinfo;
struct lmv_tgt_desc *tgt;
- /* foreign dir is not striped dir */
- if (lsm && lsm->lsm_md_magic == LMV_MAGIC_FOREIGN)
+ if (lmv_dir_foreign(lsm))
return ERR_PTR(-ENODATA);
/* During creating VOLATILE file, it should honor the mdt
if (IS_ERR(tgt))
return tgt;
- if (lsm) {
+ if (lmv_dir_striped(lsm)) {
int i;
/* refill the right parent fid */
for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
oinfo = &lsm->lsm_md_oinfo[i];
if (oinfo->lmo_mds == op_data->op_mds) {
- *fid = oinfo->lmo_fid;
+ op_data->op_fid1 = oinfo->lmo_fid;
break;
}
}
if (i == lsm->lsm_md_stripe_count)
- *fid = lsm->lsm_md_oinfo[0].lmo_fid;
+ op_data->op_fid1 = lsm->lsm_md_oinfo[0].lmo_fid;
}
- } else if (lmv_is_dir_bad_hash(lsm)) {
+ } else if (lmv_dir_bad_hash(lsm)) {
LASSERT(op_data->op_stripe_index < lsm->lsm_md_stripe_count);
oinfo = &lsm->lsm_md_oinfo[op_data->op_stripe_index];
- *fid = oinfo->lmo_fid;
+ op_data->op_fid1 = oinfo->lmo_fid;
op_data->op_mds = oinfo->lmo_mds;
tgt = lmv_get_target(lmv, oinfo->lmo_mds, NULL);
+ } else if (op_data->op_code == LUSTRE_OPC_MKDIR &&
+ lmv_dir_space_hashed(op_data->op_default_mea1) &&
+ !lmv_dir_striped(lsm)) {
+ tgt = lmv_locate_tgt_qos(lmv, &op_data->op_mds);
+ if (tgt == ERR_PTR(-EAGAIN))
+ tgt = lmv_locate_tgt_rr(lmv, &op_data->op_mds);
+ /*
+ * only update statfs when mkdir under dir with "space" hash,
+ * this means the cached statfs may be stale, and current mkdir
+ * may not follow QoS accurately, but it's not serious, and it
+ * avoids periodic statfs when client doesn't mkdir under
+ * "space" hashed directories.
+ *
+ * TODO: after MDT support QoS object allocation, also update
+ * statfs for 'lfs mkdir -i -1 ...", currently it's done in user
+ * space.
+ */
+ if (!IS_ERR(tgt)) {
+ struct obd_device *obd;
+
+ obd = container_of(lmv, struct obd_device, u.lmv);
+ lmv_statfs_check_update(obd, tgt);
+ }
} else {
- tgt = __lmv_locate_tgt(lmv, lsm, op_data->op_name,
- op_data->op_namelen, fid,
- &op_data->op_mds,
- op_data->op_post_migrate);
+ tgt = lmv_locate_tgt_by_name(lmv, op_data->op_mea1,
+ op_data->op_name, op_data->op_namelen,
+ &op_data->op_fid1, &op_data->op_mds,
+ op_data->op_post_migrate);
}
return tgt;
}
+/* Locate MDT of op_data->op_fid2 for link/rename */
+static struct lmv_tgt_desc *
+lmv_locate_tgt2(struct lmv_obd *lmv, struct md_op_data *op_data)
+{
+ struct lmv_tgt_desc *tgt;
+ int rc;
+
+ LASSERT(op_data->op_name);
+ if (lmv_dir_migrating(op_data->op_mea2)) {
+ struct lu_fid fid1 = op_data->op_fid1;
+ struct lmv_stripe_md *lsm1 = op_data->op_mea1;
+ struct ptlrpc_request *request = NULL;
+
+ /*
+ * avoid creating new file under old layout of migrating
+ * directory, check it here.
+ */
+ tgt = lmv_locate_tgt_by_name(lmv, op_data->op_mea2,
+ op_data->op_name, op_data->op_namelen,
+ &op_data->op_fid2, &op_data->op_mds, false);
+ if (IS_ERR(tgt))
+ RETURN(tgt);
+
+ op_data->op_fid1 = op_data->op_fid2;
+ op_data->op_mea1 = op_data->op_mea2;
+ rc = md_getattr_name(tgt->ltd_exp, op_data, &request);
+ op_data->op_fid1 = fid1;
+ op_data->op_mea1 = lsm1;
+ if (!rc) {
+ ptlrpc_req_finished(request);
+ RETURN(ERR_PTR(-EEXIST));
+ }
+
+ if (rc != -ENOENT)
+ RETURN(ERR_PTR(rc));
+ }
+
+ return lmv_locate_tgt_by_name(lmv, op_data->op_mea2, op_data->op_name,
+ op_data->op_namelen, &op_data->op_fid2,
+ &op_data->op_mds, true);
+}
+
int lmv_create(struct obd_export *exp, struct md_op_data *op_data,
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;
- struct lmv_tgt_desc *tgt;
- int rc;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
+
ENTRY;
if (!lmv->desc.ld_active_tgt_count)
RETURN(-EIO);
- if (lmv_is_dir_bad_hash(op_data->op_mea1))
+ if (lmv_dir_bad_hash(op_data->op_mea1))
RETURN(-EBADF);
- if (lmv_is_dir_migrating(op_data->op_mea1)) {
+ if (lmv_dir_migrating(op_data->op_mea1)) {
/*
* if parent is migrating, create() needs to lookup existing
* name, to avoid creating new file under old layout of
* migrating directory, check old layout here.
*/
- tgt = lmv_locate_tgt(lmv, op_data, &op_data->op_fid1);
+ tgt = lmv_locate_tgt(lmv, op_data);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
op_data->op_post_migrate = true;
}
- tgt = lmv_locate_tgt(lmv, op_data, &op_data->op_fid1);
+ tgt = lmv_locate_tgt(lmv, op_data);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
- op_data->op_mds = tgt->ltd_idx;
- } else {
- CDEBUG(D_CONFIG, "Server doesn't support striped dirs\n");
+ op_data->op_mds = tgt->ltd_index;
}
CDEBUG(D_INODE, "CREATE obj "DFID" -> mds #%x\n",
RETURN(PTR_ERR(tgt));
CDEBUG(D_INODE, "ENQUEUE on "DFID" -> mds #%u\n",
- PFID(&op_data->op_fid1), tgt->ltd_idx);
+ PFID(&op_data->op_fid1), tgt->ltd_index);
rc = md_enqueue(tgt->ltd_exp, einfo, policy, op_data, lockh,
extra_lock_flags);
ENTRY;
retry:
- tgt = lmv_locate_tgt(lmv, op_data, &op_data->op_fid1);
+ tgt = lmv_locate_tgt(lmv, op_data);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
CDEBUG(D_INODE, "GETATTR_NAME for %*s on "DFID" -> mds #%d\n",
(int)op_data->op_namelen, op_data->op_name,
- PFID(&op_data->op_fid1), tgt->ltd_idx);
+ PFID(&op_data->op_fid1), tgt->ltd_index);
rc = md_getattr_name(tgt->ltd_exp, op_data, preq);
if (rc == -ENOENT && lmv_dir_retry_check_update(op_data)) {
RETURN(PTR_ERR(tgt));
}
- if (tgt->ltd_idx != op_tgt) {
+ if (tgt->ltd_index != op_tgt) {
CDEBUG(D_INODE, "EARLY_CANCEL on "DFID"\n", PFID(fid));
policy.l_inodebits.bits = bits;
rc = md_cancel_unused(tgt->ltd_exp, fid, &policy,
op_data->op_fsgid = from_kgid(&init_user_ns, current_fsgid());
op_data->op_cap = cfs_curproc_cap_pack();
- if (lmv_is_dir_migrating(op_data->op_mea2)) {
- struct lu_fid fid1 = op_data->op_fid1;
- struct lmv_stripe_md *lsm1 = op_data->op_mea1;
-
- /*
- * avoid creating new file under old layout of migrating
- * directory, check it here.
- */
- tgt = __lmv_locate_tgt(lmv, op_data->op_mea2, op_data->op_name,
- op_data->op_namelen, &op_data->op_fid2,
- &op_data->op_mds, false);
- tgt = lmv_locate_tgt(lmv, op_data, &op_data->op_fid1);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
-
- op_data->op_fid1 = op_data->op_fid2;
- op_data->op_mea1 = op_data->op_mea2;
- rc = md_getattr_name(tgt->ltd_exp, op_data, request);
- op_data->op_fid1 = fid1;
- op_data->op_mea1 = lsm1;
- if (!rc) {
- ptlrpc_req_finished(*request);
- *request = NULL;
- RETURN(-EEXIST);
- }
-
- if (rc != -ENOENT)
- RETURN(rc);
- }
-
- tgt = __lmv_locate_tgt(lmv, op_data->op_mea2, op_data->op_name,
- op_data->op_namelen, &op_data->op_fid2,
- &op_data->op_mds, true);
+ tgt = lmv_locate_tgt2(lmv, op_data);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
* Cancel UPDATE lock on child (fid1).
*/
op_data->op_flags |= MF_MDC_CANCEL_FID2;
- rc = lmv_early_cancel(exp, NULL, op_data, tgt->ltd_idx, LCK_EX,
+ rc = lmv_early_cancel(exp, NULL, op_data, tgt->ltd_index, LCK_EX,
MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID1);
if (rc != 0)
RETURN(rc);
if (IS_ERR(parent_tgt))
RETURN(PTR_ERR(parent_tgt));
- if (lsm) {
+ if (lmv_dir_striped(lsm)) {
__u32 hash_type = lsm->lsm_md_hash_type;
__u32 stripe_count = lsm->lsm_md_stripe_count;
* old stripes are appended after new stripes for migrating
* directory.
*/
- if (lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION) {
+ if (lmv_dir_migrating(lsm)) {
hash_type = lsm->lsm_md_migrate_hash;
stripe_count -= lsm->lsm_md_migrate_offset;
}
if (rc < 0)
RETURN(rc);
- if (lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION)
+ if (lmv_dir_migrating(lsm))
rc += lsm->lsm_md_migrate_offset;
/* save it in fid4 temporarily for early cancel */
* if parent is being migrated too, fill op_fid2 with target
* stripe fid, otherwise the target stripe is not created yet.
*/
- if (lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION) {
+ if (lmv_dir_migrating(lsm)) {
hash_type = lsm->lsm_md_hash_type &
~LMV_HASH_FLAG_MIGRATION;
stripe_count = lsm->lsm_md_migrate_offset;
RETURN(PTR_ERR(child_tgt));
if (!S_ISDIR(op_data->op_mode) && tp_tgt)
- rc = __lmv_fid_alloc(lmv, &target_fid, tp_tgt->ltd_idx);
+ rc = __lmv_fid_alloc(lmv, &target_fid, tp_tgt->ltd_index);
else
rc = lmv_fid_alloc(NULL, exp, &target_fid, op_data);
if (rc)
}
/* cancel UPDATE lock of parent master object */
- rc = lmv_early_cancel(exp, parent_tgt, op_data, tgt->ltd_idx, LCK_EX,
+ rc = lmv_early_cancel(exp, parent_tgt, op_data, tgt->ltd_index, LCK_EX,
MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID1);
if (rc)
RETURN(rc);
op_data->op_fid4 = target_fid;
/* cancel UPDATE locks of target parent */
- rc = lmv_early_cancel(exp, tp_tgt, op_data, tgt->ltd_idx, LCK_EX,
+ rc = lmv_early_cancel(exp, tp_tgt, op_data, tgt->ltd_index, LCK_EX,
MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID2);
if (rc)
RETURN(rc);
/* cancel LOOKUP lock of source if source is remote object */
if (child_tgt != sp_tgt) {
- rc = lmv_early_cancel(exp, sp_tgt, op_data, tgt->ltd_idx,
+ rc = lmv_early_cancel(exp, sp_tgt, op_data, tgt->ltd_index,
LCK_EX, MDS_INODELOCK_LOOKUP,
MF_MDC_CANCEL_FID3);
if (rc)
}
/* cancel ELC locks of source */
- rc = lmv_early_cancel(exp, child_tgt, op_data, tgt->ltd_idx, LCK_EX,
+ rc = lmv_early_cancel(exp, child_tgt, op_data, tgt->ltd_index, LCK_EX,
MDS_INODELOCK_ELC, MF_MDC_CANCEL_FID3);
if (rc)
RETURN(rc);
op_data->op_fsgid = from_kgid(&init_user_ns, current_fsgid());
op_data->op_cap = cfs_curproc_cap_pack();
- if (lmv_is_dir_migrating(op_data->op_mea2)) {
- struct lu_fid fid1 = op_data->op_fid1;
- struct lmv_stripe_md *lsm1 = op_data->op_mea1;
-
- /*
- * we avoid creating new file under old layout of migrating
- * directory, if there is an existing file with new name under
- * old layout, we can't unlink file in old layout and rename to
- * new layout in one transaction, so return -EBUSY here.`
- */
- tgt = __lmv_locate_tgt(lmv, op_data->op_mea2, new, newlen,
- &op_data->op_fid2, &op_data->op_mds,
- false);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
-
- op_data->op_fid1 = op_data->op_fid2;
- op_data->op_mea1 = op_data->op_mea2;
- op_data->op_name = new;
- op_data->op_namelen = newlen;
- rc = md_getattr_name(tgt->ltd_exp, op_data, request);
- op_data->op_fid1 = fid1;
- op_data->op_mea1 = lsm1;
- op_data->op_name = NULL;
- op_data->op_namelen = 0;
- if (!rc) {
- ptlrpc_req_finished(*request);
- *request = NULL;
- RETURN(-EBUSY);
- }
+ op_data->op_name = new;
+ op_data->op_namelen = newlen;
- if (rc != -ENOENT)
- RETURN(rc);
- }
-
- /* rename to new layout for migrating directory */
- tp_tgt = __lmv_locate_tgt(lmv, op_data->op_mea2, new, newlen,
- &op_data->op_fid2, &op_data->op_mds, true);
+ tp_tgt = lmv_locate_tgt2(lmv, op_data);
if (IS_ERR(tp_tgt))
RETURN(PTR_ERR(tp_tgt));
op_data->op_flags |= MF_MDC_CANCEL_FID4;
/* cancel UPDATE locks of target parent */
- rc = lmv_early_cancel(exp, tp_tgt, op_data, tgt->ltd_idx, LCK_EX,
+ rc = lmv_early_cancel(exp, tp_tgt, op_data, tgt->ltd_index, LCK_EX,
MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID2);
if (rc != 0)
RETURN(rc);
/* cancel LOOKUP lock of target on target parent */
if (tgt != tp_tgt) {
rc = lmv_early_cancel(exp, tp_tgt, op_data,
- tgt->ltd_idx, LCK_EX,
+ tgt->ltd_index, LCK_EX,
MDS_INODELOCK_LOOKUP,
MF_MDC_CANCEL_FID4);
if (rc != 0)
RETURN(PTR_ERR(src_tgt));
/* cancel ELC locks of source */
- rc = lmv_early_cancel(exp, src_tgt, op_data, tgt->ltd_idx,
+ rc = lmv_early_cancel(exp, src_tgt, op_data, tgt->ltd_index,
LCK_EX, MDS_INODELOCK_ELC,
MF_MDC_CANCEL_FID3);
if (rc != 0)
RETURN(rc);
}
+ op_data->op_name = old;
+ op_data->op_namelen = oldlen;
retry:
- sp_tgt = __lmv_locate_tgt(lmv, op_data->op_mea1, old, oldlen,
- &op_data->op_fid1, &op_data->op_mds,
- op_data->op_post_migrate);
+ sp_tgt = lmv_locate_tgt(lmv, op_data);
if (IS_ERR(sp_tgt))
RETURN(PTR_ERR(sp_tgt));
/* cancel UPDATE locks of source parent */
- rc = lmv_early_cancel(exp, sp_tgt, op_data, tgt->ltd_idx, LCK_EX,
+ rc = lmv_early_cancel(exp, sp_tgt, op_data, tgt->ltd_index, LCK_EX,
MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID1);
if (rc != 0)
RETURN(rc);
/* cancel LOOKUP lock of source on source parent */
if (src_tgt != sp_tgt) {
rc = lmv_early_cancel(exp, sp_tgt, op_data,
- tgt->ltd_idx, LCK_EX,
+ tgt->ltd_index, LCK_EX,
MDS_INODELOCK_LOOKUP,
MF_MDC_CANCEL_FID3);
if (rc != 0)
/* cancel LOOKUP lock of target on target parent */
if (tgt != tp_tgt) {
rc = lmv_early_cancel(exp, tp_tgt, op_data,
- tgt->ltd_idx, LCK_EX,
+ tgt->ltd_index, LCK_EX,
MDS_INODELOCK_LOOKUP,
MF_MDC_CANCEL_FID4);
if (rc != 0)
struct md_callback *cb_op, __u64 offset,
struct page **ppage)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_stripe_md *lsm = op_data->op_mea1;
- struct lmv_tgt_desc *tgt;
- int rc;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
+
ENTRY;
- if (unlikely(lsm != NULL)) {
- /* foreign dir is not striped dir */
- if (lsm->lsm_md_magic == LMV_MAGIC_FOREIGN)
- return -ENODATA;
+ if (unlikely(lmv_dir_foreign(op_data->op_mea1)))
+ RETURN(-ENODATA);
+ if (unlikely(lmv_dir_striped(op_data->op_mea1))) {
rc = lmv_striped_read_page(exp, op_data, cb_op, offset, ppage);
RETURN(rc);
}
op_data->op_cap = cfs_curproc_cap_pack();
retry:
- parent_tgt = lmv_locate_tgt(lmv, op_data, &op_data->op_fid1);
+ parent_tgt = lmv_locate_tgt(lmv, op_data);
if (IS_ERR(parent_tgt))
RETURN(PTR_ERR(parent_tgt));
op_data->op_flags |= MF_MDC_CANCEL_FID1 | MF_MDC_CANCEL_FID3;
if (parent_tgt != tgt)
- rc = lmv_early_cancel(exp, parent_tgt, op_data, tgt->ltd_idx,
+ rc = lmv_early_cancel(exp, parent_tgt, op_data, tgt->ltd_index,
LCK_EX, MDS_INODELOCK_LOOKUP,
MF_MDC_CANCEL_FID3);
- rc = lmv_early_cancel(exp, NULL, op_data, tgt->ltd_idx, LCK_EX,
+ rc = lmv_early_cancel(exp, NULL, op_data, tgt->ltd_index, LCK_EX,
MDS_INODELOCK_ELC, MF_MDC_CANCEL_FID3);
if (rc)
RETURN(rc);
CDEBUG(D_INODE, "unlink with fid="DFID"/"DFID" -> mds #%u\n",
- PFID(&op_data->op_fid1), PFID(&op_data->op_fid2), tgt->ltd_idx);
+ PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
+ tgt->ltd_index);
rc = md_unlink(tgt->ltd_exp, op_data, request);
if (rc == -ENOENT && lmv_dir_retry_check_update(op_data)) {
RETURN(rc);
}
+static inline int lmv_unpack_user_md(struct obd_export *exp,
+ struct lmv_stripe_md *lsm,
+ const struct lmv_user_md *lmu)
+{
+ lsm->lsm_md_magic = le32_to_cpu(lmu->lum_magic);
+ lsm->lsm_md_stripe_count = le32_to_cpu(lmu->lum_stripe_count);
+ lsm->lsm_md_master_mdt_index = le32_to_cpu(lmu->lum_stripe_offset);
+ lsm->lsm_md_hash_type = le32_to_cpu(lmu->lum_hash_type);
+
+ return 0;
+}
+
static int lmv_unpackmd(struct obd_export *exp, struct lmv_stripe_md **lsmp,
const union lmv_mds_md *lmm, size_t lmm_size)
{
RETURN(0);
}
- for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
- if (lsm->lsm_md_oinfo[i].lmo_root)
- iput(lsm->lsm_md_oinfo[i].lmo_root);
+ if (lmv_dir_striped(lsm)) {
+ for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
+ if (lsm->lsm_md_oinfo[i].lmo_root)
+ iput(lsm->lsm_md_oinfo[i].lmo_root);
+ }
+ lsm_size = lmv_stripe_md_size(lsm->lsm_md_stripe_count);
+ } else {
+ lsm_size = lmv_stripe_md_size(0);
}
- lsm_size = lmv_stripe_md_size(lsm->lsm_md_stripe_count);
OBD_FREE(lsm, lsm_size);
*lsmp = NULL;
RETURN(0);
case LMV_MAGIC_V1:
rc = lmv_unpack_md_v1(exp, lsm, &lmm->lmv_md_v1);
break;
+ case LMV_USER_MAGIC:
+ rc = lmv_unpack_user_md(exp, lsm, &lmm->lmv_user_md);
+ break;
default:
CERROR("%s: unrecognized magic %x\n", exp->exp_obd->obd_name,
le32_to_cpu(lmm->lmv_magic));
struct lmv_tgt_desc *tgt = lmv->tgts[0];
ENTRY;
+ if (md->default_lmv) {
+ lmv_free_memmd(md->default_lmv);
+ md->default_lmv = NULL;
+ }
if (md->lmv != NULL) {
lmv_free_memmd(md->lmv);
md->lmv = NULL;
{
const struct lmv_oinfo *oinfo;
- LASSERT(lsm != NULL);
+ LASSERT(lmv_dir_striped(lsm));
+
oinfo = lsm_name_to_stripe_info(lsm, name, namelen, false);
if (IS_ERR(oinfo))
return PTR_ERR(oinfo);
int rc;
int i;
- /* foreign dir is not striped dir */
- if (lsm->lsm_md_magic == LMV_MAGIC_FOREIGN)
+ if (!lmv_dir_striped(lsm))
return 0;
rc = lmv_revalidate_slaves(exp, lsm, cb_blocking, 0);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff