}
lmv_set_timeouts(obd);
-
class_export_put(exp);
return 0;
if (!lmv->connected)
class_export_put(exp);
rc = class_disconnect(exp, 0);
+ if (lmv->refcount == 0)
+ lmv->connected = 0;
RETURN(rc);
}
for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
int err;
- err = obd_iocontrol(cmd, lmv->tgts[i].ltd_exp,
- len, karg, uarg);
+ if (lmv->tgts[i].ltd_exp == NULL) {
+ CWARN("%s: NULL export for %d\n", obddev->obd_name, i);
+ continue;
+ }
+
+ err = obd_iocontrol(cmd, lmv->tgts[i].ltd_exp, len, karg, uarg);
if (err) {
if (lmv->tgts[i].active) {
CERROR("error: iocontrol MDC %s on MDT"
RETURN(rc);
for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+ if (lmv->tgts[i].ltd_exp == NULL) {
+ CWARN("%s: NULL export for %d\n", obd->obd_name, i);
+ continue;
+ }
+
rc = obd_statfs(lmv->tgts[i].ltd_exp->exp_obd, &temp, max_age);
if (rc) {
CERROR("can't stat MDS #%d (%s)\n", i,
if (rc)
RETURN(rc);
+ LASSERT(i < lmv->desc.ld_tgt_count);
+
+ rc = md_getattr(lmv->tgts[i].ltd_exp, fid, valid,
+ ea_size, request);
+ if (rc)
+ RETURN(rc);
+
obj = lmv_grab_obj(obd, fid);
CDEBUG(D_OTHER, "GETATTR for %lu/%lu/%lu %s\n",
(unsigned long)fid->mds, (unsigned long)fid->id,
(unsigned long)fid->generation, obj ? "(splitted)" : "");
- LASSERT(fid->mds < lmv->desc.ld_tgt_count);
- rc = md_getattr(lmv->tgts[i].ltd_exp, fid,
- valid, ea_size, request);
- if (rc == 0 && obj) {
- /* we have to loop over dirobjs here and gather attrs for all
- * the slaves. */
-#warning "attrs gathering here"
- }
+ /* if object is splitted, then we loop over all the slaves and gather
+ * size attribute. In ideal world we would have to gather also mds field
+ * from all slaves, as object is spread over the cluster and this is
+ * definitely interesting information and it is not good to loss it,
+ * but...*/
+ if (obj) {
+ struct mds_body *body;
+
+ if (*request == NULL) {
+ lmv_put_obj(obj);
+ RETURN(rc);
+ }
+
+ body = lustre_msg_buf((*request)->rq_repmsg, 0,
+ sizeof(*body));
+ LASSERT(body != NULL);
+
+ lmv_lock_obj(obj);
+
+ for (i = 0; i < obj->objcount; i++) {
+
+ if (lmv->tgts[i].ltd_exp == NULL) {
+ CWARN("%s: NULL export for %d\n",
+ obd->obd_name, i);
+ continue;
+ }
+
+ /* skip master obj. */
+ if (fid_equal(&obj->fid, &obj->objs[i].fid))
+ continue;
+
+ body->size += obj->objs[i].size;
+ }
- if (obj)
+ lmv_unlock_obj(obj);
lmv_put_obj(obj);
+ }
RETURN(rc);
}
if (rc)
RETURN(rc);
- CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu\n",
- (unsigned long) fid->mds, (unsigned long) fid->id,
- (unsigned long) fid->generation);
+ CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu\n", (unsigned long)fid->mds,
+ (unsigned long)fid->id, (unsigned long)fid->generation);
LASSERT(fid->mds < lmv->desc.ld_tgt_count);
struct lmv_obj *obj;
int rc = 0, mds;
ENTRY;
+
rc = lmv_check_connect(obd);
if (rc)
RETURN(rc);
+
LASSERT(pfid->mds < lmv->desc.ld_tgt_count);
LASSERT(cfid->mds < lmv->desc.ld_tgt_count);
+
CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu:%*s -> %lu/%lu/%lu\n",
- (unsigned long) pfid->mds, (unsigned long) pfid->id,
- (unsigned long) pfid->generation, len, name,
- (unsigned long) cfid->mds, (unsigned long) cfid->id,
- (unsigned long) cfid->generation);
+ (unsigned long)pfid->mds, (unsigned long)pfid->id,
+ (unsigned long)pfid->generation, len, name,
+ (unsigned long)cfid->mds, (unsigned long)cfid->id,
+ (unsigned long)cfid->generation);
- /* this is default mds for directory name belongs to */
+ /* this is default mds for directory name belongs to. */
mds = pfid->mds;
obj = lmv_grab_obj(obd, pfid);
if (obj) {
- /* directory is splitted. look for right mds for this name */
- mds = raw_name2idx(obj->objcount, name, len);
+ /* directory is splitted. look for right mds for this name. */
+ mds = raw_name2idx(obj->hashtype, obj->objcount, name, len);
+ mds = obj->objs[mds].fid.mds;
lmv_put_obj(obj);
}
rc = md_change_cbdata(lmv->tgts[mds].ltd_exp, cfid, it, data);
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
struct ptlrpc_request *req = NULL;
+ struct lmv_obj *obj;
struct lustre_md md;
unsigned long valid;
int mealen, rc;
if (md.mea == NULL)
GOTO(cleanup, rc = -ENODATA);
- rc = lmv_create_obj(exp, fid, md.mea);
+ obj = lmv_create_obj(exp, fid, md.mea);
+ if (IS_ERR(obj))
+ rc = PTR_ERR(obj);
+
+ lmv_put_obj(obj);
obd_free_memmd(exp, (struct lov_stripe_md **)&md.mea);
cleanup:
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
- struct mds_body *mds_body;
+ struct mds_body *body;
struct lmv_obj *obj;
- int rc, mds;
+ int rc, mds, loop = 0;
ENTRY;
rc = lmv_check_connect(obd);
if (!lmv->desc.ld_active_tgt_count)
RETURN(-EIO);
repeat:
+ LASSERT(++loop <= 2);
obj = lmv_grab_obj(obd, &op_data->fid1);
if (obj) {
- mds = raw_name2idx(obj->objcount, op_data->name,
+ mds = raw_name2idx(obj->hashtype, obj->objcount, op_data->name,
op_data->namelen);
op_data->fid1 = obj->objs[mds].fid;
lmv_put_obj(obj);
}
- CDEBUG(D_OTHER, "CREATE '%*s' on %lu/%lu/%lu\n",
- op_data->namelen, op_data->name,
- (unsigned long) op_data->fid1.mds,
- (unsigned long) op_data->fid1.id,
- (unsigned long) op_data->fid1.generation);
+ CDEBUG(D_OTHER, "CREATE '%*s' on %lu/%lu/%lu\n", op_data->namelen,
+ op_data->name, (unsigned long)op_data->fid1.mds,
+ (unsigned long)op_data->fid1.id,
+ (unsigned long)op_data->fid1.generation);
+
rc = md_create(lmv->tgts[op_data->fid1.mds].ltd_exp, op_data, data,
datalen, mode, uid, gid, rdev, request);
if (rc == 0) {
if (*request == NULL)
- RETURN(rc);
- mds_body = lustre_msg_buf((*request)->rq_repmsg, 0,
- sizeof(*mds_body));
- LASSERT(mds_body != NULL);
- CDEBUG(D_OTHER, "created. id = %lu, generation = %lu, mds = %d\n",
- (unsigned long) mds_body->fid1.id,
- (unsigned long) mds_body->fid1.generation,
- op_data->fid1.mds);
- LASSERT(mds_body->valid & OBD_MD_MDS ||
- mds_body->mds == op_data->fid1.mds);
+ RETURN(rc);
+
+ body = lustre_msg_buf((*request)->rq_repmsg, 0,
+ sizeof(*body));
+ LASSERT(body != NULL);
+
+ CDEBUG(D_OTHER, "created. id = %lu, generation = %lu, "
+ "mds = %d\n", (unsigned long)body->fid1.id,
+ (unsigned long)body->fid1.generation, op_data->fid1.mds);
+
+ LASSERT(body->valid & OBD_MD_MDS ||
+ body->mds == op_data->fid1.mds);
} else if (rc == -ERESTART) {
- /* directory got splitted. time to update local object
- * and repeat the request with proper MDS */
+ /* directory got splitted. time to update local object and
+ * repeat the request with proper MDS */
rc = lmv_get_mea_and_update_object(exp, &op_data->fid1);
if (rc == 0) {
ptlrpc_req_finished(*request);
}
int lmv_enqueue_slaves(struct obd_export *exp, int locktype,
- struct lookup_intent *it, int lockmode,
- struct mdc_op_data *data, struct lustre_handle *lockh,
- void *lmm, int lmmsize,
- ldlm_completion_callback cb_completion,
- ldlm_blocking_callback cb_blocking, void *cb_data)
+ struct lookup_intent *it, int lockmode,
+ struct mdc_op_data *data, struct lustre_handle *lockh,
+ void *lmm, int lmmsize, ldlm_completion_callback cb_completion,
+ ldlm_blocking_callback cb_blocking, void *cb_data)
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
LASSERT(mea != NULL);
for (i = 0; i < mea->mea_count; i++) {
- if (lmv->tgts[i].ltd_exp == NULL)
- continue;
-
memset(&data2, 0, sizeof(data2));
data2.fid1 = mea->mea_fids[i];
mds = data2.fid1.mds;
+ if (lmv->tgts[mds].ltd_exp == NULL)
+ continue;
+
rc = md_enqueue(lmv->tgts[mds].ltd_exp, locktype, it, lockmode,
&data2, lockh + i, lmm, lmmsize, cb_completion,
cb_blocking, cb_data);
int lmv_enqueue(struct obd_export *exp, int lock_type,
struct lookup_intent *it, int lock_mode,
struct mdc_op_data *data, struct lustre_handle *lockh,
- void *lmm, int lmmsize,
- ldlm_completion_callback cb_completion,
+ void *lmm, int lmmsize, ldlm_completion_callback cb_completion,
ldlm_blocking_callback cb_blocking, void *cb_data)
{
struct obd_device *obd = exp->exp_obd;
if (data->namelen) {
obj = lmv_grab_obj(obd, &data->fid1);
if (obj) {
- /* directory is splitted. look for
- * right mds for this name */
- mds = raw_name2idx(obj->objcount, (char *)data->name,
- data->namelen);
+ /* directory is splitted. look for right mds for this
+ * name */
+ mds = raw_name2idx(obj->hashtype, obj->objcount,
+ (char *)data->name, data->namelen);
data->fid1 = obj->objs[mds].fid;
lmv_put_obj(obj);
}
}
- CDEBUG(D_OTHER, "ENQUEUE '%s' on %lu/%lu\n",
- LL_IT2STR(it), (unsigned long) data->fid1.id,
- (unsigned long) data->fid1.generation);
+ CDEBUG(D_OTHER, "ENQUEUE '%s' on %lu/%lu\n", LL_IT2STR(it),
+ (unsigned long)data->fid1.id, (unsigned long)data->fid1.generation);
+
rc = md_enqueue(lmv->tgts[data->fid1.mds].ltd_exp, lock_type, it,
lock_mode, data, lockh, lmm, lmmsize, cb_completion,
cb_blocking, cb_data);
}
int lmv_getattr_name(struct obd_export *exp, struct ll_fid *fid,
- char *filename, int namelen, unsigned long valid,
- unsigned int ea_size, struct ptlrpc_request **request)
+ char *filename, int namelen, unsigned long valid,
+ unsigned int ea_size, struct ptlrpc_request **request)
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
struct ll_fid rfid = *fid;
- int rc, mds = fid->mds;
+ int rc, mds = fid->mds, loop = 0;
struct mds_body *body;
struct lmv_obj *obj;
ENTRY;
if (rc)
RETURN(rc);
repeat:
+ LASSERT(++loop <= 2);
obj = lmv_grab_obj(obd, fid);
if (obj) {
/* directory is splitted. look for right mds for this name */
- mds = raw_name2idx(obj->objcount, filename, namelen - 1);
+ mds = raw_name2idx(obj->hashtype, obj->objcount, filename, namelen - 1);
rfid = obj->objs[mds].fid;
lmv_put_obj(obj);
}
+
CDEBUG(D_OTHER, "getattr_name for %*s on %lu/%lu/%lu -> %lu/%lu/%lu\n",
- namelen, filename, (unsigned long) fid->mds,
- (unsigned long) fid->id, (unsigned long) fid->generation,
- (unsigned long) rfid.mds, (unsigned long) rfid.id,
- (unsigned long) rfid.generation);
- rc = md_getattr_name(lmv->tgts[mds].ltd_exp, &rfid, filename, namelen,
- valid, ea_size, request);
+ namelen, filename, (unsigned long)fid->mds,
+ (unsigned long)fid->id, (unsigned long)fid->generation,
+ (unsigned long)rfid.mds, (unsigned long)rfid.id,
+ (unsigned long)rfid.generation);
+
+ rc = md_getattr_name(lmv->tgts[rfid.mds].ltd_exp, &rfid, filename,
+ namelen, valid, ea_size, request);
if (rc == 0) {
- /* this could be cross-node reference. in this case all
- * we have right now is mds/ino/generation triple. we'd
- * like to find other attributes */
+ /* this could be cross-node reference. in this case all we have
+ * right now is mds/ino/generation triple. we'd like to find
+ * other attributes */
body = lustre_msg_buf((*request)->rq_repmsg, 0, sizeof(*body));
LASSERT(body != NULL);
if (body->valid & OBD_MD_MDS) {
*request = req;
}
} else if (rc == -ERESTART) {
- /* directory got splitted. time to update local object
- * and repeat the request with proper MDS */
+ /* directory got splitted. time to update local object and
+ * repeat the request with proper MDS */
rc = lmv_get_mea_and_update_object(exp, &rfid);
if (rc == 0) {
ptlrpc_req_finished(*request);
/*
- * llite passes fid of an target inode in data->fid1 and
- * fid of directory in data->fid2
+ * llite passes fid of an target inode in data->fid1 and fid of directory in
+ * data->fid2
*/
int lmv_link(struct obd_export *exp, struct mdc_op_data *data,
struct ptlrpc_request **request)
struct lmv_obj *obj;
int rc;
ENTRY;
+
rc = lmv_check_connect(obd);
if (rc)
RETURN(rc);
+
if (data->namelen != 0) {
/* usual link request */
obj = lmv_grab_obj(obd, &data->fid1);
if (obj) {
- rc = raw_name2idx(obj->objcount, data->name,
+ rc = raw_name2idx(obj->hashtype, obj->objcount, data->name,
data->namelen);
data->fid1 = obj->objs[rc].fid;
lmv_put_obj(obj);
}
- CDEBUG(D_OTHER,"link %u/%u/%u:%*s to %u/%u/%u mds %d\n",
- (unsigned) data->fid2.mds, (unsigned) data->fid2.id,
- (unsigned) data->fid2.generation, data->namelen,
- data->name, (unsigned) data->fid1.mds,
- (unsigned) data->fid1.id,
- (unsigned) data->fid1.generation, data->fid1.mds);
+
+ CDEBUG(D_OTHER,"link %lu/%lu/%lu:%*s to %lu/%lu/%lu mds %lu\n",
+ (unsigned long)data->fid2.mds,
+ (unsigned long)data->fid2.id,
+ (unsigned long)data->fid2.generation,
+ data->namelen, data->name,
+ (unsigned long)data->fid1.mds,
+ (unsigned long)data->fid1.id,
+ (unsigned long)data->fid1.generation,
+ (unsigned long)data->fid1.mds);
} else {
/* request from MDS to acquire i_links for inode by fid1 */
- CDEBUG(D_OTHER, "inc i_nlinks for %u/%u/%u\n",
- (unsigned) data->fid1.mds, (unsigned) data->fid1.id,
- (unsigned) data->fid1.generation);
+ CDEBUG(D_OTHER, "inc i_nlinks for %lu/%lu/%lu\n",
+ (unsigned long)data->fid1.mds,
+ (unsigned long)data->fid1.id,
+ (unsigned long)data->fid1.generation);
}
rc = md_link(lmv->tgts[data->fid1.mds].ltd_exp, data, request);
ENTRY;
CDEBUG(D_OTHER, "rename %*s in %lu/%lu/%lu to %*s in %lu/%lu/%lu\n",
- oldlen, old, (unsigned long) data->fid1.mds,
- (unsigned long) data->fid1.id,
- (unsigned long) data->fid1.generation,
+ oldlen, old, (unsigned long)data->fid1.mds,
+ (unsigned long)data->fid1.id,
+ (unsigned long)data->fid1.generation,
newlen, new, (unsigned long) data->fid2.mds,
(unsigned long) data->fid2.id,
(unsigned long) data->fid2.generation);
+
if (!fid_equal(&data->fid1, &data->fid2))
CWARN("cross-node rename %lu/%lu/%lu:%*s to %lu/%lu/%lu:%*s\n",
- (unsigned long) data->fid1.mds,
- (unsigned long) data->fid1.id,
- (unsigned long) data->fid1.generation, oldlen, old,
- (unsigned long) data->fid2.mds,
- (unsigned long) data->fid2.id,
- (unsigned long) data->fid2.generation, newlen, new);
+ (unsigned long)data->fid1.mds,
+ (unsigned long)data->fid1.id,
+ (unsigned long)data->fid1.generation, oldlen, old,
+ (unsigned long)data->fid2.mds,
+ (unsigned long)data->fid2.id,
+ (unsigned long)data->fid2.generation, newlen, new);
rc = lmv_check_connect(obd);
if (rc)
RETURN(rc);
if (oldlen == 0) {
- /* MDS with old dir entry is asking another MDS
- * to create name there */
+ /* MDS with old dir entry is asking another MDS to create name
+ * there */
CDEBUG(D_OTHER,
"create %*s(%d/%d) in %lu/%lu/%lu pointing to %lu/%lu/%lu\n",
newlen, new, oldlen, newlen,
- (unsigned long) data->fid2.mds,
- (unsigned long) data->fid2.id,
- (unsigned long) data->fid2.generation,
- (unsigned long) data->fid1.mds,
- (unsigned long) data->fid1.id,
- (unsigned long) data->fid1.generation);
+ (unsigned long)data->fid2.mds,
+ (unsigned long)data->fid2.id,
+ (unsigned long)data->fid2.generation,
+ (unsigned long)data->fid1.mds,
+ (unsigned long)data->fid1.id,
+ (unsigned long)data->fid1.generation);
mds = data->fid2.mds;
goto request;
}
obj = lmv_grab_obj(obd, &data->fid1);
if (obj) {
- /* directory is already splitted, so we have to forward
- * request to the right MDS */
- mds = raw_name2idx(obj->objcount, (char *)old, oldlen);
+ /* directory is already splitted, so we have to forward request
+ * to the right MDS */
+ mds = raw_name2idx(obj->hashtype, obj->objcount, (char *)old, oldlen);
data->fid1 = obj->objs[mds].fid;
CDEBUG(D_OTHER, "forward to MDS #%u (%lu/%lu/%lu)\n", mds,
- (unsigned long) obj->objs[mds].fid.mds,
- (unsigned long) obj->objs[mds].fid.id,
- (unsigned long) obj->objs[mds].fid.generation);
+ (unsigned long)obj->objs[mds].fid.mds,
+ (unsigned long)obj->objs[mds].fid.id,
+ (unsigned long)obj->objs[mds].fid.generation);
lmv_put_obj(obj);
}
obj = lmv_grab_obj(obd, &data->fid2);
if (obj) {
- /* directory is already splitted, so we have to forward
- * request to the right MDS */
- mds = raw_name2idx(obj->objcount, (char *)new, newlen);
+ /* directory is already splitted, so we have to forward request
+ * to the right MDS */
+ mds = raw_name2idx(obj->hashtype, obj->objcount, (char *)new, newlen);
data->fid2 = obj->objs[mds].fid;
CDEBUG(D_OTHER, "forward to MDS #%u (%lu/%lu/%lu)\n", mds,
- (unsigned long) obj->objs[mds].fid.mds,
- (unsigned long) obj->objs[mds].fid.id,
- (unsigned long) obj->objs[mds].fid.generation);
+ (unsigned long)obj->objs[mds].fid.mds,
+ (unsigned long)obj->objs[mds].fid.id,
+ (unsigned long)obj->objs[mds].fid.generation);
lmv_put_obj(obj);
}
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
- int rc = 0, i = data->fid1.mds;
struct ptlrpc_request *req;
- struct mds_body *mds_body;
+ struct mds_body *body;
struct lmv_obj *obj;
+ int rc = 0, i;
ENTRY;
rc = lmv_check_connect(obd);
RETURN(rc);
obj = lmv_grab_obj(obd, &data->fid1);
+
CDEBUG(D_OTHER, "SETATTR for %lu/%lu/%lu, valid 0x%x%s\n",
- (unsigned long) data->fid1.mds,
- (unsigned long) data->fid1.id,
- (unsigned long) data->fid1.generation, iattr->ia_valid,
+ (unsigned long)data->fid1.mds, (unsigned long)data->fid1.id,
+ (unsigned long)data->fid1.generation, iattr->ia_valid,
obj ? ", splitted" : "");
+
if (obj) {
for (i = 0; i < obj->objcount; i++) {
data->fid1 = obj->objs[i].fid;
- rc = md_setattr(lmv->tgts[i].ltd_exp, data, iattr, ea,
- ealen, ea2, ea2len, &req);
- LASSERT(rc == 0);
+
+ rc = md_setattr(lmv->tgts[data->fid1.mds].ltd_exp, data,
+ iattr, ea, ealen, ea2, ea2len, &req);
+
if (fid_equal(&obj->fid, &obj->objs[i].fid)) {
- /* this is master object and this request
- * should be returned back to llite */
+ /* this is master object and this request should
+ * be returned back to llite */
*request = req;
} else {
ptlrpc_req_finished(req);
}
+
+ if (rc)
+ break;
}
lmv_put_obj(obj);
} else {
LASSERT(data->fid1.mds < lmv->desc.ld_tgt_count);
- rc = md_setattr(lmv->tgts[i].ltd_exp, data, iattr, ea, ealen,
- ea2, ea2len, request);
+ rc = md_setattr(lmv->tgts[data->fid1.mds].ltd_exp, data,
+ iattr, ea, ealen, ea2, ea2len, request);
if (rc == 0) {
- mds_body = lustre_msg_buf((*request)->rq_repmsg, 0,
- sizeof(*mds_body));
- LASSERT(mds_body != NULL);
- LASSERT(mds_body->mds == i);
+ body = lustre_msg_buf((*request)->rq_repmsg, 0,
+ sizeof(*body));
+ LASSERT(body != NULL);
+ LASSERT(body->mds == data->fid1.mds);
}
}
RETURN(rc);
if (rc)
RETURN(rc);
- rc = md_sync(lmv->tgts[0].ltd_exp, fid, request);
+ rc = md_sync(lmv->tgts[fid->mds].ltd_exp, fid, request);
RETURN(rc);
}
obj = lmv_grab_obj(obd, mdc_fid);
if (obj) {
- /* find dirobj containing page with requested offset */
- /* FIXME: what about protecting cached attrs here? */
+ lmv_lock_obj(obj);
+
+ /* find dirobj containing page with requested offset. */
for (i = 0; i < obj->objcount; i++) {
if (offset < obj->objs[i].size)
break;
offset -= obj->objs[i].size;
}
rfid = obj->objs[i].fid;
+
+ lmv_unlock_obj(obj);
lmv_put_obj(obj);
CDEBUG(D_OTHER, "forward to %lu/%lu/%lu with offset %lu\n",
LASSERT(mea != NULL);
for (i = 0; i < mea->mea_count; i++) {
- if (lmv->tgts[i].ltd_exp == NULL)
- continue;
-
memset(&data2, 0, sizeof(data2));
data2.fid1 = mea->mea_fids[i];
data2.create_mode = MDS_MODE_DONT_LOCK | S_IFDIR;
mds = data2.fid1.mds;
+
+ if (lmv->tgts[mds].ltd_exp == NULL)
+ continue;
+
rc = md_unlink(lmv->tgts[mds].ltd_exp, &data2, req);
CDEBUG(D_OTHER, "unlink slave %lu/%lu/%lu -> %d\n",
(unsigned long) mea->mea_fids[i].mds,
RETURN(rc);
}
+int lmv_delete_object(struct obd_export *exp, struct ll_fid *fid)
+{
+ ENTRY;
+
+ if (!lmv_delete_obj(exp, fid)) {
+ CDEBUG(D_OTHER, "Object %lu/%lu/%lu is not found.\n",
+ (unsigned long)fid->mds, (unsigned long)fid->id,
+ (unsigned long)fid->generation);
+ }
+
+ RETURN(0);
+}
+
int lmv_unlink(struct obd_export *exp, struct mdc_op_data *data,
struct ptlrpc_request **request)
{
obj = lmv_grab_obj(obd, &data->fid1);
if (obj) {
- i = raw_name2idx(obj->objcount, data->name,
+ i = raw_name2idx(obj->hashtype, obj->objcount, data->name,
data->namelen);
data->fid1 = obj->objs[i].fid;
lmv_put_obj(obj);
rc = lmv_check_connect(obd);
if (rc)
RETURN(ERR_PTR(rc));
+#warning "we need well-desgined readdir() implementation to remove this mess"
obd = lmv->tgts[0].ltd_exp->exp_obd;
EXIT;
return obd;
RETURN(0);
for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+ if (lmv->tgts[i].ltd_exp == NULL) {
+ CWARN("%s: NULL export for %d\n", obd->obd_name, i);
+ continue;
+ }
+
rc = obd_init_ea_size(lmv->tgts[i].ltd_exp, easize, cookiesize);
if (rc) {
CERROR("obd_init_ea_size() failed on MDT target %d, "
{
struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv;
- struct mea *mea;
int i, c, rc = 0;
+ struct mea *mea;
struct ll_fid mfid;
+ int lcount;
ENTRY;
rc = lmv_check_connect(obd);
mea = (struct mea *)*ea;
if (!mea->mea_count || mea->mea_count > lmv->desc.ld_tgt_count)
mea->mea_count = lmv->desc.ld_tgt_count;
+ mea->mea_magic = MEA_MAGIC_ALL_CHARS;
mea->mea_master = -1;
-
- for (i = 0, c = 0; c < mea->mea_count &&
- i < lmv->desc.ld_tgt_count; i++) {
+ lcount = lmv->desc.ld_tgt_count;
+ for (i = 0, c = 0; c < mea->mea_count && i < lcount; i++) {
struct lov_stripe_md obj_md;
struct lov_stripe_md *obj_mdp = &obj_md;
.m_unlink = lmv_unlink,
.m_get_real_obd = lmv_get_real_obd,
.m_valid_attrs = lmv_valid_attrs,
+ .m_delete_object = lmv_delete_object,
};
int __init lmv_init(void)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff