const struct obd_uuid *uuid,
int activate)
{
- struct lmv_tgt_desc *tgt = NULL;
- struct obd_device *obd;
- __u32 i;
- int rc = 0;
+ struct lu_tgt_desc *tgt = NULL;
+ struct obd_device *obd;
+ int rc = 0;
+
ENTRY;
CDEBUG(D_INFO, "Searching in lmv %p for uuid %s (activate=%d)\n",
lmv, uuid->uuid, activate);
spin_lock(&lmv->lmv_lock);
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
- tgt = lmv->tgts[i];
- if (tgt == NULL || tgt->ltd_exp == NULL)
- continue;
-
- CDEBUG(D_INFO, "Target idx %d is %s conn %#llx\n", i,
- tgt->ltd_uuid.uuid, tgt->ltd_exp->exp_handle.h_cookie);
+ lmv_foreach_connected_tgt(lmv, tgt) {
+ CDEBUG(D_INFO, "Target idx %d is %s conn %#llx\n",
+ tgt->ltd_index, tgt->ltd_uuid.uuid,
+ tgt->ltd_exp->exp_handle.h_cookie);
if (obd_uuid_equals(uuid, &tgt->ltd_uuid))
break;
}
- if (i == lmv->desc.ld_tgt_count)
- GOTO(out_lmv_lock, rc = -EINVAL);
+ if (!tgt)
+ GOTO(out_lmv_lock, rc = -EINVAL);
- obd = class_exp2obd(tgt->ltd_exp);
- if (obd == NULL)
- GOTO(out_lmv_lock, rc = -ENOTCONN);
+ obd = class_exp2obd(tgt->ltd_exp);
+ if (obd == NULL)
+ GOTO(out_lmv_lock, rc = -ENOTCONN);
- CDEBUG(D_INFO, "Found OBD %s=%s device %d (%p) type %s at LMV idx %d\n",
- obd->obd_name, obd->obd_uuid.uuid, obd->obd_minor, obd,
- obd->obd_type->typ_name, i);
- LASSERT(strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) == 0);
+ CDEBUG(D_INFO, "Found OBD %s=%s device %d (%p) type %s at LMV idx %d\n",
+ obd->obd_name, obd->obd_uuid.uuid, obd->obd_minor, obd,
+ obd->obd_type->typ_name, tgt->ltd_index);
+ LASSERT(strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) == 0);
- if (tgt->ltd_active == activate) {
- CDEBUG(D_INFO, "OBD %p already %sactive!\n", obd,
- activate ? "" : "in");
- GOTO(out_lmv_lock, rc);
- }
+ if (tgt->ltd_active == activate) {
+ CDEBUG(D_INFO, "OBD %p already %sactive!\n", obd,
+ activate ? "" : "in");
+ GOTO(out_lmv_lock, rc);
+ }
- CDEBUG(D_INFO, "Marking OBD %p %sactive\n", obd,
- activate ? "" : "in");
- lmv_activate_target(lmv, tgt, activate);
- EXIT;
+ CDEBUG(D_INFO, "Marking OBD %p %sactive\n", obd,
+ activate ? "" : "in");
+ lmv_activate_target(lmv, tgt, activate);
+ EXIT;
out_lmv_lock:
spin_unlock(&lmv->lmv_lock);
struct obd_uuid *lmv_get_uuid(struct obd_export *exp)
{
- struct lmv_obd *lmv = &exp->exp_obd->u.lmv;
- struct lmv_tgt_desc *tgt = lmv->tgts[0];
+ struct lmv_obd *lmv = &exp->exp_obd->u.lmv;
+ struct lmv_tgt_desc *tgt = lmv_tgt(lmv, 0);
return (tgt == NULL) ? NULL : obd_get_uuid(tgt->ltd_exp);
}
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;
- __u32 i;
- int rc = 0;
- int change = 0;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int change = 0;
+ int rc = 0;
+
ENTRY;
- if (lmv->max_easize < easize) {
- lmv->max_easize = easize;
- change = 1;
- }
- if (lmv->max_def_easize < def_easize) {
- lmv->max_def_easize = def_easize;
- change = 1;
- }
+ if (lmv->max_easize < easize) {
+ lmv->max_easize = easize;
+ change = 1;
+ }
+ if (lmv->max_def_easize < def_easize) {
+ lmv->max_def_easize = def_easize;
+ change = 1;
+ }
if (change == 0)
RETURN(0);
if (lmv->connected == 0)
RETURN(0);
- 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) {
- CWARN("%s: NULL export for %d\n", obd->obd_name, i);
- continue;
- }
+ lmv_foreach_connected_tgt(lmv, tgt) {
if (!tgt->ltd_active)
continue;
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);
+ " rc = %d\n", obd->obd_name, tgt->ltd_index, rc);
break;
}
}
RETURN(0);
}
-static void lmv_del_target(struct lmv_obd *lmv, int index)
+static void lmv_del_target(struct lmv_obd *lmv, struct lu_tgt_desc *tgt)
{
- 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;
+ LASSERT(tgt);
+ lqos_del_tgt(&lmv->lmv_qos, tgt);
+ lu_tgt_descs_del(&lmv->lmv_mdt_descs, tgt);
+ OBD_FREE_PTR(tgt);
}
static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
struct obd_device *mdc_obd;
struct lmv_obd *lmv = &obd->u.lmv;
struct lmv_tgt_desc *tgt;
+ struct lu_tgt_descs *ltd = &lmv->lmv_mdt_descs;
int orig_tgt_count = 0;
int rc = 0;
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 LMV target index %d:"
- " rc = %d\n", obd->obd_name,
- obd_uuid2str(&tgt->ltd_uuid), index, -EEXIST);
- mutex_unlock(&lmv->lmv_init_mutex);
- RETURN(-EEXIST);
- }
-
- if (index >= lmv->tgts_size) {
- /* We need to reallocate the lmv target array. */
- struct lmv_tgt_desc **newtgts, **old = NULL;
- __u32 newsize = 1;
- __u32 oldsize = 0;
-
- while (newsize < index + 1)
- newsize = newsize << 1;
- OBD_ALLOC(newtgts, sizeof(*newtgts) * newsize);
- if (newtgts == NULL) {
- mutex_unlock(&lmv->lmv_init_mutex);
- RETURN(-ENOMEM);
- }
-
- if (lmv->tgts_size) {
- memcpy(newtgts, lmv->tgts,
- sizeof(*newtgts) * lmv->tgts_size);
- old = lmv->tgts;
- oldsize = lmv->tgts_size;
- }
-
- lmv->tgts = newtgts;
- lmv->tgts_size = newsize;
- smp_rmb();
- if (old)
- OBD_FREE(old, sizeof(*old) * oldsize);
-
- CDEBUG(D_CONFIG, "tgts: %p size: %d\n", lmv->tgts,
- lmv->tgts_size);
- }
-
OBD_ALLOC_PTR(tgt);
- if (!tgt) {
- mutex_unlock(&lmv->lmv_init_mutex);
+ if (!tgt)
RETURN(-ENOMEM);
- }
mutex_init(&tgt->ltd_fid_mutex);
tgt->ltd_index = index;
tgt->ltd_uuid = *uuidp;
tgt->ltd_active = 0;
- lmv->tgts[index] = tgt;
- if (index >= lmv->desc.ld_tgt_count) {
+
+ mutex_lock(<d->ltd_mutex);
+ rc = lu_tgt_descs_add(ltd, tgt);
+ if (!rc && index >= lmv->desc.ld_tgt_count) {
orig_tgt_count = lmv->desc.ld_tgt_count;
lmv->desc.ld_tgt_count = index + 1;
}
+ mutex_unlock(<d->ltd_mutex);
+
+ if (rc)
+ GOTO(out_tgt, rc);
- if (lmv->connected == 0) {
+ if (!lmv->connected)
/* 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;
+ mutex_lock(<d->ltd_mutex);
+ lmv->desc.ld_tgt_count = orig_tgt_count;
memset(tgt, 0, sizeof(*tgt));
- spin_unlock(&lmv->lmv_lock);
+ mutex_unlock(<d->ltd_mutex);
} else {
int easize = sizeof(struct lmv_stripe_md) +
lmv->desc.ld_tgt_count * sizeof(struct lu_fid);
}
RETURN(rc);
+
+out_tgt:
+ OBD_FREE_PTR(tgt);
+ return rc;
}
static int lmv_check_connect(struct obd_device *obd)
{
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_tgt_desc *tgt;
- __u32 i;
- int rc;
- int easize;
- ENTRY;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int easize;
+ int rc;
- if (lmv->connected)
- RETURN(0);
+ ENTRY;
- mutex_lock(&lmv->lmv_init_mutex);
- if (lmv->connected) {
- mutex_unlock(&lmv->lmv_init_mutex);
- RETURN(0);
- }
+ if (lmv->connected)
+ RETURN(0);
- if (lmv->desc.ld_tgt_count == 0) {
- mutex_unlock(&lmv->lmv_init_mutex);
- CERROR("%s: no targets configured.\n", obd->obd_name);
- RETURN(-EINVAL);
- }
+ mutex_lock(&lmv->lmv_mdt_descs.ltd_mutex);
+ if (lmv->connected)
+ GOTO(unlock, rc = 0);
- LASSERT(lmv->tgts != NULL);
+ if (lmv->desc.ld_tgt_count == 0) {
+ CERROR("%s: no targets configured: rc = -EINVAL\n",
+ obd->obd_name);
+ GOTO(unlock, rc = -EINVAL);
+ }
- if (lmv->tgts[0] == NULL) {
- mutex_unlock(&lmv->lmv_init_mutex);
- CERROR("%s: no target configured for index 0.\n",
+ if (!lmv_mdt0_inited(lmv)) {
+ CERROR("%s: no target configured for index 0: rc = -EINVAL.\n",
obd->obd_name);
- RETURN(-EINVAL);
+ GOTO(unlock, rc = -EINVAL);
}
CDEBUG(D_CONFIG, "Time to connect %s to %s\n",
obd->obd_uuid.uuid, obd->obd_name);
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
- tgt = lmv->tgts[i];
- if (tgt == NULL)
- continue;
+ lmv_foreach_tgt(lmv, tgt) {
rc = lmv_connect_mdc(obd, tgt);
if (rc)
GOTO(out_disc, rc);
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);
- mutex_unlock(&lmv->lmv_init_mutex);
- RETURN(0);
+ EXIT;
+unlock:
+ mutex_unlock(&lmv->lmv_mdt_descs.ltd_mutex);
- out_disc:
- while (i-- > 0) {
- int rc2;
- tgt = lmv->tgts[i];
- if (tgt == NULL)
+ return rc;
+
+out_disc:
+ lmv_foreach_tgt(lmv, tgt) {
+ tgt->ltd_active = 0;
+ if (!tgt->ltd_exp)
continue;
- tgt->ltd_active = 0;
- if (tgt->ltd_exp) {
- --lmv->desc.ld_active_tgt_count;
- rc2 = obd_disconnect(tgt->ltd_exp);
- if (rc2) {
- CERROR("LMV target %s disconnect on "
- "MDC idx %d: error %d\n",
- tgt->ltd_uuid.uuid, i, rc2);
- }
- }
- }
- mutex_unlock(&lmv->lmv_init_mutex);
+ --lmv->desc.ld_active_tgt_count;
+ obd_disconnect(tgt->ltd_exp);
+ }
- RETURN(rc);
+ goto unlock;
}
static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
static int lmv_disconnect(struct obd_export *exp)
{
- struct obd_device *obd = class_exp2obd(exp);
- struct lmv_obd *lmv = &obd->u.lmv;
- int rc;
- __u32 i;
- ENTRY;
-
- if (!lmv->tgts)
- goto out_local;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
- if (lmv->tgts[i] == NULL || lmv->tgts[i]->ltd_exp == NULL)
- continue;
+ ENTRY;
- lmv_disconnect_mdc(obd, lmv->tgts[i]);
- }
+ lmv_foreach_connected_tgt(lmv, tgt)
+ lmv_disconnect_mdc(obd, tgt);
if (lmv->lmv_tgts_kobj)
kobject_put(lmv->lmv_tgts_kobj);
-out_local:
- /*
- * This is the case when no real connection is established by
- * lmv_check_connect().
- */
- if (!lmv->connected)
- class_export_put(exp);
- rc = class_disconnect(exp);
+ if (!lmv->connected)
+ class_export_put(exp);
+ rc = class_disconnect(exp);
lmv->connected = 0;
RETURN(rc);
static int lmv_fid2path(struct obd_export *exp, int len, void *karg,
void __user *uarg)
{
- struct obd_device *obddev = class_exp2obd(exp);
- struct lmv_obd *lmv = &obddev->u.lmv;
+ struct obd_device *obddev = class_exp2obd(exp);
+ struct lmv_obd *lmv = &obddev->u.lmv;
struct getinfo_fid2path *gf;
- struct lmv_tgt_desc *tgt;
+ struct lmv_tgt_desc *tgt;
struct getinfo_fid2path *remote_gf = NULL;
- struct lu_fid root_fid;
- int remote_gf_size = 0;
- int rc;
+ struct lu_fid root_fid;
+ int remote_gf_size = 0;
+ int rc;
gf = karg;
- tgt = lmv_find_target(lmv, &gf->gf_fid);
+ tgt = lmv_fid2tgt(lmv, &gf->gf_fid);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
GOTO(out_fid2path, rc = -EINVAL);
}
- tgt = lmv_find_target(lmv, &gf->gf_fid);
+ tgt = lmv_fid2tgt(lmv, &gf->gf_fid);
if (IS_ERR(tgt))
GOTO(out_fid2path, rc = -EINVAL);
const struct hsm_user_request *hur,
const struct lmv_tgt_desc *tgt_mds)
{
- __u32 i;
- int nr = 0;
- struct lmv_tgt_desc *curr_tgt;
+ struct lmv_tgt_desc *curr_tgt;
+ __u32 i;
+ int nr = 0;
/* count how many requests must be sent to the given target */
for (i = 0; i < hur->hur_request.hr_itemcount; i++) {
- curr_tgt = lmv_find_target(lmv, &hur->hur_user_item[i].hui_fid);
+ curr_tgt = lmv_fid2tgt(lmv, &hur->hur_user_item[i].hui_fid);
if (IS_ERR(curr_tgt))
RETURN(PTR_ERR(curr_tgt));
if (obd_uuid_equals(&curr_tgt->ltd_uuid, &tgt_mds->ltd_uuid))
const struct lmv_tgt_desc *tgt_mds,
struct hsm_user_request *hur_out)
{
- __u32 i, nr_out;
- struct lmv_tgt_desc *curr_tgt;
+ __u32 i, nr_out;
+ struct lmv_tgt_desc *curr_tgt;
/* build the hsm_user_request for the given target */
hur_out->hur_request = hur_in->hur_request;
nr_out = 0;
for (i = 0; i < hur_in->hur_request.hr_itemcount; i++) {
- curr_tgt = lmv_find_target(lmv,
- &hur_in->hur_user_item[i].hui_fid);
+ curr_tgt = lmv_fid2tgt(lmv, &hur_in->hur_user_item[i].hui_fid);
if (IS_ERR(curr_tgt))
RETURN(PTR_ERR(curr_tgt));
if (obd_uuid_equals(&curr_tgt->ltd_uuid, &tgt_mds->ltd_uuid)) {
void __user *uarg)
{
struct lmv_obd *lmv = &obd->u.lmv;
- __u32 i;
- int rc;
+ struct lu_tgt_desc *tgt;
+ int rc;
+
ENTRY;
/* unregister request (call from llapi_hsm_copytool_fini) */
- 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)
- continue;
+ lmv_foreach_connected_tgt(lmv, tgt)
/* best effort: try to clean as much as possible
* (continue on error) */
obd_iocontrol(cmd, tgt->ltd_exp, len, lk, uarg);
- }
/* Whatever the result, remove copytool from kuc groups.
* Unreached coordinators will get EPIPE on next requests
{
struct lmv_obd *lmv = &obd->u.lmv;
struct file *filp;
- __u32 i, j;
- int err;
bool any_set = false;
struct kkuc_ct_data *kcd;
size_t kcd_size;
+ struct lu_tgt_desc *tgt;
+ __u32 i;
+ int err;
int rc = 0;
+
ENTRY;
filp = fget(lk->lk_wfd);
/* All or nothing: try to register to all MDS.
* In case of failure, unregister from previous MDS,
* except if it because of inactive target. */
- 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)
- continue;
-
+ lmv_foreach_connected_tgt(lmv, tgt) {
err = obd_iocontrol(cmd, tgt->ltd_exp, len, lk, uarg);
if (err) {
if (tgt->ltd_active) {
CERROR("%s: iocontrol MDC %s on MDT"
" idx %d cmd %x: err = %d\n",
lmv2obd_dev(lmv)->obd_name,
- tgt->ltd_uuid.uuid, i, cmd, err);
+ tgt->ltd_uuid.uuid, tgt->ltd_index, cmd,
+ err);
rc = err;
lk->lk_flags |= LK_FLG_STOP;
+ i = tgt->ltd_index;
/* unregister from previous MDS */
- for (j = 0; j < i; j++) {
- tgt = lmv->tgts[j];
- if (tgt == NULL || tgt->ltd_exp == NULL)
- continue;
+ lmv_foreach_connected_tgt(lmv, tgt) {
+ if (tgt->ltd_index >= i)
+ break;
+
obd_iocontrol(cmd, tgt->ltd_exp, len,
lk, uarg);
}
return rc;
}
-
-
-
static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
int len, void *karg, void __user *uarg)
{
- struct obd_device *obddev = class_exp2obd(exp);
- struct lmv_obd *lmv = &obddev->u.lmv;
- struct lmv_tgt_desc *tgt = NULL;
- __u32 i = 0;
- int rc = 0;
- int set = 0;
- __u32 count = lmv->desc.ld_tgt_count;
+ struct obd_device *obddev = class_exp2obd(exp);
+ struct lmv_obd *lmv = &obddev->u.lmv;
+ struct lu_tgt_desc *tgt = NULL;
+ int set = 0;
+ __u32 count = lmv->desc.ld_tgt_count;
+ int rc = 0;
+
ENTRY;
- if (count == 0)
- RETURN(-ENOTTY);
+ if (count == 0)
+ RETURN(-ENOTTY);
- switch (cmd) {
- case IOC_OBD_STATFS: {
- struct obd_ioctl_data *data = karg;
- struct obd_device *mdc_obd;
- struct obd_statfs stat_buf = {0};
- __u32 index;
+ switch (cmd) {
+ case IOC_OBD_STATFS: {
+ struct obd_ioctl_data *data = karg;
+ struct obd_device *mdc_obd;
+ struct obd_statfs stat_buf = {0};
+ __u32 index;
- memcpy(&index, data->ioc_inlbuf2, sizeof(__u32));
- if ((index >= count))
- RETURN(-ENODEV);
+ memcpy(&index, data->ioc_inlbuf2, sizeof(__u32));
+ if (index >= count)
+ RETURN(-ENODEV);
- tgt = lmv->tgts[index];
- if (tgt == NULL || !tgt->ltd_active)
+ tgt = lmv_tgt(lmv, index);
+ if (!tgt || !tgt->ltd_active)
RETURN(-ENODATA);
mdc_obd = class_exp2obd(tgt->ltd_exp);
(int) sizeof(stat_buf))))
RETURN(-EFAULT);
break;
- }
- case OBD_IOC_QUOTACTL: {
- struct if_quotactl *qctl = karg;
- struct obd_quotactl *oqctl;
+ }
+ case OBD_IOC_QUOTACTL: {
+ struct if_quotactl *qctl = karg;
+ struct obd_quotactl *oqctl;
if (qctl->qc_valid == QC_MDTIDX) {
if (count <= qctl->qc_idx)
RETURN(-EINVAL);
- tgt = lmv->tgts[qctl->qc_idx];
- if (tgt == NULL || tgt->ltd_exp == NULL)
+ tgt = lmv_tgt(lmv, qctl->qc_idx);
+ if (!tgt || !tgt->ltd_exp)
RETURN(-EINVAL);
} else if (qctl->qc_valid == QC_UUID) {
- for (i = 0; i < count; i++) {
- tgt = lmv->tgts[i];
- if (tgt == NULL)
- continue;
+ lmv_foreach_tgt(lmv, tgt) {
if (!obd_uuid_equals(&tgt->ltd_uuid,
&qctl->obd_uuid))
continue;
- if (tgt->ltd_exp == NULL)
- RETURN(-EINVAL);
+ if (!tgt->ltd_exp)
+ RETURN(-EINVAL);
- break;
- }
- } else {
- RETURN(-EINVAL);
- }
+ break;
+ }
+ } else {
+ RETURN(-EINVAL);
+ }
- if (i >= count)
- RETURN(-EAGAIN);
+ if (tgt->ltd_index >= count)
+ RETURN(-EAGAIN);
- LASSERT(tgt != NULL && tgt->ltd_exp != NULL);
- OBD_ALLOC_PTR(oqctl);
- if (!oqctl)
- RETURN(-ENOMEM);
+ LASSERT(tgt != NULL && tgt->ltd_exp != NULL);
+ OBD_ALLOC_PTR(oqctl);
+ if (!oqctl)
+ RETURN(-ENOMEM);
- QCTL_COPY(oqctl, qctl);
- rc = obd_quotactl(tgt->ltd_exp, oqctl);
- if (rc == 0) {
- QCTL_COPY(qctl, oqctl);
- qctl->qc_valid = QC_MDTIDX;
- qctl->obd_uuid = tgt->ltd_uuid;
- }
- OBD_FREE_PTR(oqctl);
- break;
- }
+ QCTL_COPY(oqctl, qctl);
+ rc = obd_quotactl(tgt->ltd_exp, oqctl);
+ if (rc == 0) {
+ QCTL_COPY(qctl, oqctl);
+ qctl->qc_valid = QC_MDTIDX;
+ qctl->obd_uuid = tgt->ltd_uuid;
+ }
+ OBD_FREE_PTR(oqctl);
+ break;
+ }
case LL_IOC_GET_CONNECT_FLAGS: {
- tgt = lmv->tgts[0];
- if (tgt == NULL || tgt->ltd_exp == NULL)
- RETURN(-ENODATA);
- rc = obd_iocontrol(cmd, tgt->ltd_exp, len, karg, uarg);
+ tgt = lmv_tgt(lmv, 0);
+ rc = -ENODATA;
+ if (tgt && tgt->ltd_exp)
+ rc = obd_iocontrol(cmd, tgt->ltd_exp, len, karg, uarg);
break;
}
case LL_IOC_FID2MDTIDX: {
case LL_IOC_HSM_STATE_GET:
case LL_IOC_HSM_STATE_SET:
case LL_IOC_HSM_ACTION: {
- struct md_op_data *op_data = karg;
+ struct md_op_data *op_data = karg;
- tgt = lmv_find_target(lmv, &op_data->op_fid1);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
case LL_IOC_HSM_PROGRESS: {
const struct hsm_progress_kernel *hpk = karg;
- tgt = lmv_find_target(lmv, &hpk->hpk_fid);
+ tgt = lmv_fid2tgt(lmv, &hpk->hpk_fid);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
rc = obd_iocontrol(cmd, tgt->ltd_exp, len, karg, uarg);
* or if there is a single MDS, no need to split
* the request. */
if (reqcount == 1 || count == 1) {
- tgt = lmv_find_target(lmv,
- &hur->hur_user_item[0].hui_fid);
+ tgt = lmv_fid2tgt(lmv, &hur->hur_user_item[0].hui_fid);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
rc = obd_iocontrol(cmd, tgt->ltd_exp, len, karg, uarg);
} else {
/* split fid list to their respective MDS */
- for (i = 0; i < count; i++) {
+ lmv_foreach_connected_tgt(lmv, tgt) {
int nr, rc1;
size_t reqlen;
struct hsm_user_request *req;
- tgt = lmv->tgts[i];
- if (tgt == NULL || tgt->ltd_exp == NULL)
- continue;
-
nr = lmv_hsm_req_count(lmv, hur, tgt);
if (nr < 0)
RETURN(nr);
break;
}
case LL_IOC_LOV_SWAP_LAYOUTS: {
- struct md_op_data *op_data = karg;
- struct lmv_tgt_desc *tgt1, *tgt2;
+ struct md_op_data *op_data = karg;
+ struct lmv_tgt_desc *tgt1, *tgt2;
- tgt1 = lmv_find_target(lmv, &op_data->op_fid1);
+ tgt1 = lmv_fid2tgt(lmv, &op_data->op_fid1);
if (IS_ERR(tgt1))
RETURN(PTR_ERR(tgt1));
- tgt2 = lmv_find_target(lmv, &op_data->op_fid2);
+ tgt2 = lmv_fid2tgt(lmv, &op_data->op_fid2);
if (IS_ERR(tgt2))
RETURN(PTR_ERR(tgt2));
break;
}
default:
- for (i = 0; i < count; i++) {
+ lmv_foreach_connected_tgt(lmv, tgt) {
struct obd_device *mdc_obd;
int err;
- tgt = lmv->tgts[i];
- if (tgt == NULL || tgt->ltd_exp == NULL)
- continue;
/* ll_umount_begin() sets force flag but for lmv, not
* mdc. Let's pass it through */
mdc_obd = class_exp2obd(tgt->ltd_exp);
if (tgt->ltd_active) {
CERROR("error: iocontrol MDC %s on MDT"
" idx %d cmd %x: err = %d\n",
- tgt->ltd_uuid.uuid, i, cmd, err);
+ tgt->ltd_uuid.uuid,
+ tgt->ltd_index, cmd, err);
if (!rc)
rc = err;
}
} else
set = 1;
- }
- if (!set && !rc)
- rc = -EIO;
- }
- RETURN(rc);
+ }
+ if (!set && !rc)
+ rc = -EIO;
+ }
+ RETURN(rc);
}
/**
int __lmv_fid_alloc(struct lmv_obd *lmv, struct lu_fid *fid, u32 mds)
{
- struct lmv_tgt_desc *tgt;
- int rc;
+ struct lmv_tgt_desc *tgt;
+ int rc;
+
ENTRY;
- tgt = lmv_get_target(lmv, mds, NULL);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
+ tgt = lmv_tgt(lmv, mds);
+ if (!tgt)
+ RETURN(-ENODEV);
/*
* New seq alloc and FLD setup should be atomic. Otherwise we may find
ENTRY;
- if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1) {
- CERROR("LMV setup requires a descriptor\n");
- RETURN(-EINVAL);
- }
-
- desc = (struct lmv_desc *)lustre_cfg_buf(lcfg, 1);
- if (sizeof(*desc) > LUSTRE_CFG_BUFLEN(lcfg, 1)) {
- CERROR("Lmv descriptor size wrong: %d > %d\n",
- (int)sizeof(*desc), LUSTRE_CFG_BUFLEN(lcfg, 1));
- RETURN(-EINVAL);
- }
+ if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1) {
+ CERROR("LMV setup requires a descriptor\n");
+ RETURN(-EINVAL);
+ }
- lmv->tgts_size = 32U;
- OBD_ALLOC(lmv->tgts, sizeof(*lmv->tgts) * lmv->tgts_size);
- if (lmv->tgts == NULL)
- RETURN(-ENOMEM);
+ desc = (struct lmv_desc *)lustre_cfg_buf(lcfg, 1);
+ if (sizeof(*desc) > LUSTRE_CFG_BUFLEN(lcfg, 1)) {
+ CERROR("Lmv descriptor size wrong: %d > %d\n",
+ (int)sizeof(*desc), LUSTRE_CFG_BUFLEN(lcfg, 1));
+ RETURN(-EINVAL);
+ }
obd_str2uuid(&lmv->desc.ld_uuid, desc->ld_uuid.uuid);
lmv->desc.ld_tgt_count = 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);
rc = fld_client_init(&lmv->lmv_fld, obd->obd_name,
LUSTRE_CLI_FLD_HASH_DHT);
- if (rc) {
+ if (rc)
CERROR("Can't init FLD, err %d\n", rc);
- GOTO(out, rc);
- }
- RETURN(0);
+ rc = lu_tgt_descs_init(&lmv->lmv_mdt_descs);
+ if (rc)
+ CWARN("%s: error initialize target table: rc = %d\n",
+ obd->obd_name, rc);
-out:
- return rc;
+ RETURN(rc);
}
static int lmv_cleanup(struct obd_device *obd)
{
- struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lu_tgt_desc *tgt;
+ struct lu_tgt_desc *tmp;
+
ENTRY;
fld_client_fini(&lmv->lmv_fld);
- if (lmv->tgts != NULL) {
- int i;
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
- if (lmv->tgts[i] == NULL)
- continue;
- lmv_del_target(lmv, i);
- }
- OBD_FREE(lmv->tgts, sizeof(*lmv->tgts) * lmv->tgts_size);
- lmv->tgts_size = 0;
- }
+ lmv_foreach_tgt_safe(lmv, tgt, tmp)
+ lmv_del_target(lmv, tgt);
+ lu_tgt_descs_fini(&lmv->lmv_mdt_descs);
+
RETURN(0);
}
static int lmv_statfs(const struct lu_env *env, struct obd_export *exp,
struct obd_statfs *osfs, time64_t max_age, __u32 flags)
{
- struct obd_device *obd = class_exp2obd(exp);
- struct lmv_obd *lmv = &obd->u.lmv;
- struct obd_statfs *temp;
- int rc = 0;
- __u32 i, idx;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct obd_statfs *temp;
+ struct lu_tgt_desc *tgt;
+ __u32 i;
+ __u32 idx;
+ int rc = 0;
+
ENTRY;
- OBD_ALLOC(temp, sizeof(*temp));
- if (temp == NULL)
- RETURN(-ENOMEM);
+ OBD_ALLOC(temp, sizeof(*temp));
+ if (temp == NULL)
+ RETURN(-ENOMEM);
/* distribute statfs among MDTs */
idx = lmv_select_statfs_mdt(lmv, flags);
for (i = 0; i < lmv->desc.ld_tgt_count; i++, idx++) {
idx = idx % lmv->desc.ld_tgt_count;
- if (lmv->tgts[idx] == NULL || lmv->tgts[idx]->ltd_exp == NULL)
+ tgt = lmv_tgt(lmv, idx);
+ if (!tgt || !tgt->ltd_exp)
continue;
- rc = obd_statfs(env, lmv->tgts[idx]->ltd_exp, temp,
- max_age, flags);
+ rc = obd_statfs(env, tgt->ltd_exp, temp, max_age, flags);
if (rc) {
CERROR("%s: can't stat MDS #%d: rc = %d\n",
- lmv->tgts[idx]->ltd_exp->exp_obd->obd_name, i,
- rc);
+ tgt->ltd_exp->exp_obd->obd_name, i, rc);
GOTO(out_free_temp, rc);
}
osfs->os_files += temp->os_files;
osfs->os_granted += temp->os_granted;
}
- }
+ }
- EXIT;
+ EXIT;
out_free_temp:
- OBD_FREE(temp, sizeof(*temp));
- return rc;
+ OBD_FREE(temp, sizeof(*temp));
+ return rc;
}
static int lmv_statfs_update(void *cookie, int rc)
static int lmv_get_root(struct obd_export *exp, const char *fileset,
struct lu_fid *fid)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- int rc;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lu_tgt_desc *tgt = lmv_tgt(lmv, 0);
+ int rc;
- rc = md_get_root(lmv->tgts[0]->ltd_exp, fileset, fid);
+ ENTRY;
+
+ if (!tgt)
+ RETURN(-ENODEV);
+
+ rc = md_get_root(tgt->ltd_exp, fileset, fid);
RETURN(rc);
}
u64 obd_md_valid, const char *name, size_t buf_size,
struct ptlrpc_request **req)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_tgt_desc *tgt;
- int rc;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
+
+ ENTRY;
- tgt = lmv_find_target(lmv, fid);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
+ tgt = lmv_fid2tgt(lmv, fid);
+ if (IS_ERR(tgt))
+ RETURN(PTR_ERR(tgt));
rc = md_getxattr(tgt->ltd_exp, fid, obd_md_valid, name, buf_size, req);
unsigned int xattr_flags, u32 suppgid,
struct ptlrpc_request **req)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_tgt_desc *tgt;
- int rc;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
+
+ ENTRY;
- tgt = lmv_find_target(lmv, fid);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
+ tgt = lmv_fid2tgt(lmv, fid);
+ if (IS_ERR(tgt))
+ RETURN(PTR_ERR(tgt));
rc = md_setxattr(tgt->ltd_exp, fid, obd_md_valid, name,
value, value_size, xattr_flags, suppgid, req);
}
static int lmv_getattr(struct obd_export *exp, struct md_op_data *op_data,
- struct ptlrpc_request **request)
+ 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;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
+
+ ENTRY;
- tgt = lmv_find_target(lmv, &op_data->op_fid1);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
+ if (IS_ERR(tgt))
+ RETURN(PTR_ERR(tgt));
if (op_data->op_flags & MF_GET_MDT_IDX) {
op_data->op_mds = tgt->ltd_index;
RETURN(0);
}
- rc = md_getattr(tgt->ltd_exp, op_data, request);
+ rc = md_getattr(tgt->ltd_exp, op_data, request);
- RETURN(rc);
+ RETURN(rc);
}
static int lmv_null_inode(struct obd_export *exp, const struct lu_fid *fid)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- __u32 i;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lu_tgt_desc *tgt;
+
+ ENTRY;
- CDEBUG(D_INODE, "CBDATA for "DFID"\n", PFID(fid));
+ CDEBUG(D_INODE, "CBDATA for "DFID"\n", PFID(fid));
/*
* With DNE every object can have two locks in different namespaces:
* lookup lock in space of MDT storing direntry and update/open lock in
* space of MDT storing inode.
*/
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
- if (lmv->tgts[i] == NULL || lmv->tgts[i]->ltd_exp == NULL)
- continue;
- md_null_inode(lmv->tgts[i]->ltd_exp, fid);
- }
+ lmv_foreach_connected_tgt(lmv, tgt)
+ md_null_inode(tgt->ltd_exp, fid);
RETURN(0);
}
static int lmv_close(struct obd_export *exp, struct md_op_data *op_data,
- struct md_open_data *mod, struct ptlrpc_request **request)
+ struct md_open_data *mod, 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;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
- tgt = lmv_find_target(lmv, &op_data->op_fid1);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
+ ENTRY;
- CDEBUG(D_INODE, "CLOSE "DFID"\n", PFID(&op_data->op_fid1));
- rc = md_close(tgt->ltd_exp, op_data, mod, request);
- RETURN(rc);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
+ if (IS_ERR(tgt))
+ RETURN(PTR_ERR(tgt));
+
+ CDEBUG(D_INODE, "CLOSE "DFID"\n", PFID(&op_data->op_fid1));
+ rc = md_close(tgt->ltd_exp, op_data, mod, request);
+ RETURN(rc);
}
static struct lmv_tgt_desc *
const struct lmv_oinfo *oinfo;
if (!lmv_dir_striped(lsm) || !namelen) {
- tgt = lmv_find_target(lmv, fid);
+ tgt = lmv_fid2tgt(lmv, fid);
if (IS_ERR(tgt))
return tgt;
*fid = oinfo->lmo_fid;
*mds = oinfo->lmo_mds;
- tgt = lmv_get_target(lmv, oinfo->lmo_mds, NULL);
+ tgt = lmv_tgt(lmv, oinfo->lmo_mds);
CDEBUG(D_INODE, "locate MDT %u parent "DFID"\n", *mds, PFID(fid));
- return tgt;
+ return tgt ? tgt : ERR_PTR(-ENODEV);
}
/**
* ct_restore(). */
if (op_data->op_bias & MDS_CREATE_VOLATILE &&
(int)op_data->op_mds != -1) {
- tgt = lmv_get_target(lmv, op_data->op_mds, NULL);
- if (IS_ERR(tgt))
- return tgt;
+ tgt = lmv_tgt(lmv, op_data->op_mds);
+ if (!tgt)
+ return ERR_PTR(-ENODEV);
if (lmv_dir_striped(lsm)) {
int i;
op_data->op_fid1 = oinfo->lmo_fid;
op_data->op_mds = oinfo->lmo_mds;
- tgt = lmv_get_target(lmv, oinfo->lmo_mds, NULL);
+ tgt = lmv_tgt(lmv, oinfo->lmo_mds);
+ if (!tgt)
+ tgt = ERR_PTR(-ENODEV);
} else if (op_data->op_code == LUSTRE_OPC_MKDIR &&
lmv_dir_qos_mkdir(op_data->op_default_mea1) &&
!lmv_dir_striped(lsm)) {
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);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
const union ldlm_policy_data *policy, struct md_op_data *op_data,
struct lustre_handle *lockh, __u64 extra_lock_flags)
{
- 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;
CDEBUG(D_INODE, "ENQUEUE on "DFID"\n", PFID(&op_data->op_fid1));
- tgt = lmv_find_target(lmv, &op_data->op_fid1);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
RETURN(0);
if (tgt == NULL) {
- tgt = lmv_find_target(lmv, fid);
+ tgt = lmv_fid2tgt(lmv, fid);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
}
op_data->op_fsgid = from_kgid(&init_user_ns, current_fsgid());
op_data->op_cap = cfs_curproc_cap_pack();
- parent_tgt = lmv_find_target(lmv, &op_data->op_fid1);
+ parent_tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
if (IS_ERR(parent_tgt))
RETURN(PTR_ERR(parent_tgt));
/* save it in fid4 temporarily for early cancel */
op_data->op_fid4 = lsm->lsm_md_oinfo[rc].lmo_fid;
- sp_tgt = lmv_get_target(lmv, lsm->lsm_md_oinfo[rc].lmo_mds,
- NULL);
- if (IS_ERR(sp_tgt))
- RETURN(PTR_ERR(sp_tgt));
+ sp_tgt = lmv_tgt(lmv, lsm->lsm_md_oinfo[rc].lmo_mds);
+ if (!sp_tgt)
+ RETURN(-ENODEV);
/*
* if parent is being migrated too, fill op_fid2 with target
RETURN(rc);
op_data->op_fid2 = lsm->lsm_md_oinfo[rc].lmo_fid;
- tp_tgt = lmv_get_target(lmv,
- lsm->lsm_md_oinfo[rc].lmo_mds,
- NULL);
- if (IS_ERR(tp_tgt))
- RETURN(PTR_ERR(tp_tgt));
+ tp_tgt = lmv_tgt(lmv, lsm->lsm_md_oinfo[rc].lmo_mds);
+ if (!tp_tgt)
+ RETURN(-ENODEV);
}
} else {
sp_tgt = parent_tgt;
}
- child_tgt = lmv_find_target(lmv, &op_data->op_fid3);
+ child_tgt = lmv_fid2tgt(lmv, &op_data->op_fid3);
if (IS_ERR(child_tgt))
RETURN(PTR_ERR(child_tgt));
*/
if (S_ISDIR(op_data->op_mode) &&
(exp_connect_flags2(exp) & OBD_CONNECT2_DIR_MIGRATE)) {
- tgt = lmv_find_target(lmv, &target_fid);
+ tgt = lmv_fid2tgt(lmv, &target_fid);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
} else {
* target child does not exist, then it will send the request to the
* target parent */
if (fid_is_sane(&op_data->op_fid4)) {
- tgt = lmv_find_target(lmv, &op_data->op_fid4);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid4);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
} else {
}
if (fid_is_sane(&op_data->op_fid3)) {
- src_tgt = lmv_find_target(lmv, &op_data->op_fid3);
+ src_tgt = lmv_fid2tgt(lmv, &op_data->op_fid3);
if (IS_ERR(src_tgt))
RETURN(PTR_ERR(src_tgt));
ptlrpc_req_finished(*request);
*request = NULL;
- tgt = lmv_find_target(lmv, &op_data->op_fid4);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid4);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data,
void *ea, size_t ealen, 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 = 0;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc = 0;
+
ENTRY;
CDEBUG(D_INODE, "SETATTR for "DFID", valid 0x%x/0x%x\n",
op_data->op_xvalid);
op_data->op_flags |= MF_MDC_CANCEL_FID1;
- tgt = lmv_find_target(lmv, &op_data->op_fid1);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
static int lmv_fsync(struct obd_export *exp, const struct lu_fid *fid,
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;
- tgt = lmv_find_target(lmv, fid);
+ tgt = lmv_fid2tgt(lmv, fid);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
break;
}
- tgt = lmv_get_target(ctxt->ldc_lmv, oinfo->lmo_mds, NULL);
- if (IS_ERR(tgt)) {
- rc = PTR_ERR(tgt);
+ tgt = lmv_tgt(ctxt->ldc_lmv, oinfo->lmo_mds);
+ if (!tgt) {
+ rc = -ENODEV;
break;
}
static int lmv_file_resync(struct obd_export *exp, struct md_op_data *data)
{
- 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;
rc = lmv_check_connect(obd);
if (rc != 0)
RETURN(rc);
- tgt = lmv_find_target(lmv, &data->op_fid1);
+ tgt = lmv_fid2tgt(lmv, &data->op_fid1);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
RETURN(rc);
}
- tgt = lmv_find_target(lmv, &op_data->op_fid1);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
RETURN(PTR_ERR(parent_tgt));
if (likely(!fid_is_zero(&op_data->op_fid2))) {
- tgt = lmv_find_target(lmv, &op_data->op_fid2);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
} else {
ptlrpc_req_finished(*request);
*request = NULL;
- tgt = lmv_find_target(lmv, &op_data->op_fid2);
+ tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
static int lmv_get_info(const struct lu_env *env, struct obd_export *exp,
__u32 keylen, void *key, __u32 *vallen, void *val)
{
- 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 %#llx\n",
- exp->exp_handle.h_cookie);
- RETURN(-EINVAL);
- }
+ struct obd_device *obd;
+ struct lmv_obd *lmv;
+ struct lu_tgt_desc *tgt;
+ int rc = 0;
- lmv = &obd->u.lmv;
- if (keylen >= strlen("remote_flag") && !strcmp(key, "remote_flag")) {
- int i;
+ ENTRY;
- LASSERT(*vallen == sizeof(__u32));
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
- struct lmv_tgt_desc *tgt = lmv->tgts[i];
- /*
- * All tgts should be connected when this gets called.
- */
- if (tgt == NULL || tgt->ltd_exp == NULL)
- continue;
+ obd = class_exp2obd(exp);
+ if (obd == NULL) {
+ CDEBUG(D_IOCTL, "Invalid client cookie %#llx\n",
+ exp->exp_handle.h_cookie);
+ RETURN(-EINVAL);
+ }
+ lmv = &obd->u.lmv;
+ if (keylen >= strlen("remote_flag") && !strcmp(key, "remote_flag")) {
+ LASSERT(*vallen == sizeof(__u32));
+ lmv_foreach_connected_tgt(lmv, tgt) {
if (!obd_get_info(env, tgt->ltd_exp, keylen, key,
vallen, val))
RETURN(0);
* Forwarding this request to first MDS, it should know LOV
* desc.
*/
- rc = obd_get_info(env, lmv->tgts[0]->ltd_exp, keylen, key,
- vallen, val);
+ tgt = lmv_tgt(lmv, 0);
+ if (!tgt)
+ RETURN(-ENODEV);
+
+ rc = obd_get_info(env, tgt->ltd_exp, keylen, key, vallen, val);
if (!rc && KEY_IS(KEY_CONN_DATA))
exp->exp_connect_data = *(struct obd_connect_data *)val;
- RETURN(rc);
- } else if (KEY_IS(KEY_TGT_COUNT)) {
- *((int *)val) = lmv->desc.ld_tgt_count;
- RETURN(0);
- }
+ RETURN(rc);
+ } else if (KEY_IS(KEY_TGT_COUNT)) {
+ *((int *)val) = lmv->desc.ld_tgt_count;
+ RETURN(0);
+ }
- CDEBUG(D_IOCTL, "Invalid key\n");
- RETURN(-EINVAL);
+ CDEBUG(D_IOCTL, "Invalid key\n");
+ RETURN(-EINVAL);
}
static int lmv_rmfid(struct obd_export *exp, struct fid_array *fa,
struct ptlrpc_request_set *set = _set;
struct lmv_obd *lmv = &obddev->u.lmv;
int tgt_count = lmv->desc.ld_tgt_count;
+ struct lu_tgt_desc *tgt;
struct fid_array *fat, **fas = NULL;
int i, rc, **rcs = NULL;
fat->fa_fids[fat->fa_nr++] = fa->fa_fids[i];
}
- for (i = 0; i < tgt_count; i++) {
- fat = fas[i];
+ lmv_foreach_connected_tgt(lmv, tgt) {
+ fat = fas[tgt->ltd_index];
if (!fat || fat->fa_nr == 0)
continue;
- rc = md_rmfid(lmv->tgts[i]->ltd_exp, fat, rcs[i], set);
+ rc = md_rmfid(tgt->ltd_exp, fat, rcs[tgt->ltd_index], set);
}
rc = ptlrpc_set_wait(NULL, set);
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];
-
- if (tgt == NULL || tgt->ltd_exp == NULL)
- continue;
+ int err = 0;
+ lmv_foreach_connected_tgt(lmv, tgt) {
err = obd_set_info_async(env, tgt->ltd_exp,
keylen, key, vallen, val, set);
if (err && rc == 0)
void *opaque)
{
struct lmv_obd *lmv = &exp->exp_obd->u.lmv;
+ struct lu_tgt_desc *tgt;
+ int err;
int rc = 0;
- __u32 i;
+
ENTRY;
LASSERT(fid != NULL);
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
- struct lmv_tgt_desc *tgt = lmv->tgts[i];
- int err;
-
- if (tgt == NULL || tgt->ltd_exp == NULL || !tgt->ltd_active)
+ lmv_foreach_connected_tgt(lmv, tgt) {
+ if (!tgt->ltd_active)
continue;
err = md_cancel_unused(tgt->ltd_exp, fid, policy, mode, flags,
const struct lustre_handle *lockh,
void *data, __u64 *bits)
{
- struct lmv_obd *lmv = &exp->exp_obd->u.lmv;
- struct lmv_tgt_desc *tgt = lmv->tgts[0];
- int rc;
+ struct lmv_obd *lmv = &exp->exp_obd->u.lmv;
+ struct lmv_tgt_desc *tgt = lmv_tgt(lmv, 0);
+ int rc;
+
ENTRY;
if (tgt == NULL || tgt->ltd_exp == NULL)
union ldlm_policy_data *policy,
enum ldlm_mode mode, struct lustre_handle *lockh)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- enum ldlm_mode rc;
- int tgt;
- int i;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ enum ldlm_mode rc;
+ struct lu_tgt_desc *tgt;
+ int i;
+ int index;
+
ENTRY;
CDEBUG(D_INODE, "Lock match for "DFID"\n", PFID(fid));
- /*
+ /*
* With DNE every object can have two locks in different namespaces:
* lookup lock in space of MDT storing direntry and update/open lock in
* space of MDT storing inode. Try the MDT that the FID maps to first,
* since this can be easily found, and only try others if that fails.
*/
- for (i = 0, tgt = lmv_find_target_index(lmv, fid);
+ for (i = 0, index = lmv_fid2tgt_index(lmv, fid);
i < lmv->desc.ld_tgt_count;
- i++, tgt = (tgt + 1) % lmv->desc.ld_tgt_count) {
- if (tgt < 0) {
+ i++, index = (index + 1) % lmv->desc.ld_tgt_count) {
+ if (index < 0) {
CDEBUG(D_HA, "%s: "DFID" is inaccessible: rc = %d\n",
- obd->obd_name, PFID(fid), tgt);
- tgt = 0;
+ obd->obd_name, PFID(fid), index);
+ index = 0;
}
- if (lmv->tgts[tgt] == NULL ||
- lmv->tgts[tgt]->ltd_exp == NULL ||
- lmv->tgts[tgt]->ltd_active == 0)
+ tgt = lmv_tgt(lmv, index);
+ if (!tgt || !tgt->ltd_exp || !tgt->ltd_active)
continue;
- rc = md_lock_match(lmv->tgts[tgt]->ltd_exp, flags, fid,
- type, policy, mode, lockh);
+ rc = md_lock_match(tgt->ltd_exp, flags, fid, type, policy, mode,
+ lockh);
if (rc)
RETURN(rc);
}
struct obd_export *dt_exp, struct obd_export *md_exp,
struct lustre_md *md)
{
- struct lmv_obd *lmv = &exp->exp_obd->u.lmv;
- struct lmv_tgt_desc *tgt = lmv->tgts[0];
+ struct lmv_obd *lmv = &exp->exp_obd->u.lmv;
+ struct lmv_tgt_desc *tgt = lmv_tgt(lmv, 0);
- if (tgt == NULL || tgt->ltd_exp == NULL)
- RETURN(-EINVAL);
+ if (!tgt || !tgt->ltd_exp)
+ return -EINVAL;
- return md_get_lustre_md(lmv->tgts[0]->ltd_exp, req, dt_exp, md_exp, md);
+ return md_get_lustre_md(tgt->ltd_exp, req, dt_exp, md_exp, md);
}
int lmv_free_lustre_md(struct obd_export *exp, struct lustre_md *md)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_tgt_desc *tgt = lmv->tgts[0];
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt = lmv_tgt(lmv, 0);
+
ENTRY;
if (md->default_lmv) {
lmv_free_memmd(md->lmv);
md->lmv = NULL;
}
- if (tgt == NULL || tgt->ltd_exp == NULL)
+ if (!tgt || !tgt->ltd_exp)
RETURN(-EINVAL);
- RETURN(md_free_lustre_md(lmv->tgts[0]->ltd_exp, md));
+ RETURN(md_free_lustre_md(tgt->ltd_exp, md));
}
int lmv_set_open_replay_data(struct obd_export *exp,
struct obd_client_handle *och,
struct lookup_intent *it)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_tgt_desc *tgt;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+
ENTRY;
- tgt = lmv_find_target(lmv, &och->och_fid);
+ tgt = lmv_fid2tgt(lmv, &och->och_fid);
if (IS_ERR(tgt))
RETURN(PTR_ERR(tgt));
}
int lmv_clear_open_replay_data(struct obd_export *exp,
- struct obd_client_handle *och)
+ struct obd_client_handle *och)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_tgt_desc *tgt;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+
+ ENTRY;
- tgt = lmv_find_target(lmv, &och->och_fid);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
+ tgt = lmv_fid2tgt(lmv, &och->och_fid);
+ if (IS_ERR(tgt))
+ RETURN(PTR_ERR(tgt));
- RETURN(md_clear_open_replay_data(tgt->ltd_exp, och));
+ RETURN(md_clear_open_replay_data(tgt->ltd_exp, och));
}
int lmv_intent_getattr_async(struct obd_export *exp,
if (IS_ERR(ptgt))
RETURN(PTR_ERR(ptgt));
- ctgt = lmv_find_target(lmv, &op_data->op_fid2);
+ ctgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
if (IS_ERR(ctgt))
RETURN(PTR_ERR(ctgt));
}
int lmv_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
- struct lu_fid *fid, __u64 *bits)
+ struct lu_fid *fid, __u64 *bits)
{
- struct obd_device *obd = exp->exp_obd;
- struct lmv_obd *lmv = &obd->u.lmv;
- struct lmv_tgt_desc *tgt;
- int rc;
- ENTRY;
+ struct obd_device *obd = exp->exp_obd;
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt;
+ int rc;
- tgt = lmv_find_target(lmv, fid);
- if (IS_ERR(tgt))
- RETURN(PTR_ERR(tgt));
+ ENTRY;
- rc = md_revalidate_lock(tgt->ltd_exp, it, fid, bits);
- RETURN(rc);
+ tgt = lmv_fid2tgt(lmv, fid);
+ if (IS_ERR(tgt))
+ RETURN(PTR_ERR(tgt));
+
+ rc = md_revalidate_lock(tgt->ltd_exp, it, fid, bits);
+ RETURN(rc);
}
int lmv_get_fid_from_lsm(struct obd_export *exp,
int lmv_quotactl(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 = lmv->tgts[0];
- int rc = 0;
- __u32 i;
- __u64 curspace, curinodes;
+ struct obd_device *obd = class_exp2obd(exp);
+ struct lmv_obd *lmv = &obd->u.lmv;
+ struct lmv_tgt_desc *tgt = lmv_tgt(lmv, 0);
+ __u64 curspace, curinodes;
+ int rc = 0;
+
ENTRY;
- if (tgt == NULL ||
- tgt->ltd_exp == NULL ||
- !tgt->ltd_active ||
- lmv->desc.ld_tgt_count == 0) {
+ if (!tgt || !tgt->ltd_exp || !tgt->ltd_active) {
CERROR("master lmv inactive\n");
RETURN(-EIO);
}
- if (oqctl->qc_cmd != Q_GETOQUOTA) {
- rc = obd_quotactl(tgt->ltd_exp, oqctl);
- RETURN(rc);
- }
+ if (oqctl->qc_cmd != Q_GETOQUOTA) {
+ rc = obd_quotactl(tgt->ltd_exp, oqctl);
+ RETURN(rc);
+ }
- curspace = curinodes = 0;
- for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+ curspace = curinodes = 0;
+ lmv_foreach_connected_tgt(lmv, tgt) {
int err;
- tgt = lmv->tgts[i];
- if (tgt == NULL || tgt->ltd_exp == NULL || !tgt->ltd_active)
+ if (!tgt->ltd_active)
continue;
- err = obd_quotactl(tgt->ltd_exp, oqctl);
- if (err) {
- CERROR("getquota on mdt %d failed. %d\n", i, err);
- if (!rc)
- rc = err;
- } else {
- curspace += oqctl->qc_dqblk.dqb_curspace;
- curinodes += oqctl->qc_dqblk.dqb_curinodes;
- }
- }
- oqctl->qc_dqblk.dqb_curspace = curspace;
- oqctl->qc_dqblk.dqb_curinodes = curinodes;
+ err = obd_quotactl(tgt->ltd_exp, oqctl);
+ if (err) {
+ CERROR("getquota on mdt %d failed. %d\n",
+ tgt->ltd_index, err);
+ if (!rc)
+ rc = err;
+ } else {
+ curspace += oqctl->qc_dqblk.dqb_curspace;
+ curinodes += oqctl->qc_dqblk.dqb_curinodes;
+ }
+ }
+ oqctl->qc_dqblk.dqb_curspace = curspace;
+ oqctl->qc_dqblk.dqb_curinodes = curinodes;
- RETURN(rc);
+ RETURN(rc);
}
static int lmv_merge_attr(struct obd_export *exp,
git://git.whamcloud.com / fs / lustre-release.git / commitdiff