rc2 = obd_disconnect(tgts->ltd_exp, 0);
if (rc2)
CERROR("error: LMV target %s disconnect on MDT idx %d: "
- "rc = %d\n", uuid.uuid, i, rc2);
+ "error %d\n", uuid.uuid, i, rc2);
}
class_disconnect(exp, 0);
RETURN (rc);
}
out_local:
- /* This is the case when no real connection is established by
+ /* this is the case when no real connection is established by
* lmv_check_connect(). */
if (!lmv->connected)
class_export_put(exp);
rc = lmv_check_connect(obd);
if (rc)
RETURN(rc);
- CDEBUG(D_OTHER, "validate %lu/%lu/%lu\n",
- (unsigned long) fid->mds,
- (unsigned long) fid->id,
- (unsigned long) fid->generation);
+ CDEBUG(D_OTHER, "validate %lu/%lu/%lu\n", (unsigned long) fid->mds,
+ (unsigned long) fid->id, (unsigned long) fid->generation);
LASSERT(fid->mds < lmv->desc.ld_tgt_count);
rc = md_valid_attrs(lmv->tgts[fid->mds].ltd_exp, fid);
RETURN(rc);
rc = md_getattr(lmv->tgts[fid->mds].ltd_exp, fid,
valid, mealen, &req);
if (rc) {
- CERROR("md_getattr() failed, rc = %d\n", rc);
+ CERROR("md_getattr() failed, error %d\n", rc);
GOTO(cleanup, rc);
}
rc = mdc_req2lustre_md(exp, req, 0, NULL, &md);
if (rc) {
- CERROR("mdc_req2lustre_md() failed, rc = %d\n", rc);
+ CERROR("mdc_req2lustre_md() failed, error %d\n", rc);
GOTO(cleanup, rc);
}
obj = lmv_grab_obj(obd, &data->fid1, 0);
if (obj) {
rc = raw_name2idx(obj->objcount, data->name,
- data->namelen);
+ data->namelen);
data->fid1 = obj->objs[rc].fid;
lmv_put_obj(obj);
}
struct lmv_obd *lmv = &obd->u.lmv;
int rc, i = 0;
ENTRY;
+
rc = lmv_check_connect(obd);
if (rc)
RETURN(rc);
if (lmv->connected == 0)
RETURN(0);
- /* FIXME: error handling? */
- for (i = 0; i < lmv->desc.ld_tgt_count; i++)
+ for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
rc = obd_init_ea_size(lmv->tgts[i].ltd_exp, easize, cookiesize);
+ if (rc) {
+ CERROR("obd_init_ea_size() failed on MDT target %d, "
+ "error %d.\n", i, rc);
+ break;
+ }
+ }
RETURN(rc);
}
LASSERT(oa->o_mds < lmv->desc.ld_tgt_count);
rc = obd_create(lmv->tgts[oa->o_mds].ltd_exp, oa, &obj_mdp, oti);
- LASSERT(rc == 0);
RETURN(rc);
}
if (*ea == NULL) {
rc = obd_alloc_diskmd(exp, (struct lov_mds_md **)ea);
- LASSERT(*ea != NULL);
+ if (rc < 0) {
+ CERROR("obd_alloc_diskmd() failed, error %d\n",
+ rc);
+ RETURN(rc);
+ }
+
+ if (*ea == NULL)
+ RETURN(-EINVAL);
}
- mea = (struct mea *)*ea;
+ rc = 0;
mfid.id = oa->o_id;
mfid.generation = oa->o_generation;
- rc = 0;
+
+ 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_master = -1;
- /* FIXME: error handling? */
for (i = 0, c = 0; c < mea->mea_count &&
i < lmv->desc.ld_tgt_count; i++) {
struct lov_stripe_md obj_md;
continue;
}
- /* "Master" MDS should always be part of stripped dir, so
- scan for it */
+ /* "master" MDS should always be part of stripped dir, so scan
+ for it. */
if (mea->mea_master == -1 && c == mea->mea_count - 1)
continue;
oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLTYPE | OBD_MD_FLMODE
- | OBD_MD_FLUID | OBD_MD_FLGID | OBD_MD_FLID;
+ | OBD_MD_FLUID | OBD_MD_FLGID | OBD_MD_FLID;
rc = obd_create(lmv->tgts[c].ltd_exp, oa, &obj_mdp, oti);
- /* FIXME: error handling here */
- LASSERT(rc == 0);
+ if (rc) {
+ CERROR("obd_create() failed on MDT target %d, "
+ "error %d\n", c, rc);
+ RETURN(rc);
+ }
mea->mea_fids[c].id = oa->o_id;
mea->mea_fids[c].generation = oa->o_generation;
RETURN(0);
}
- if (!*lmmp) {
+ if (*lmmp == NULL) {
OBD_ALLOC(*lmmp, mea_size);
- if (!*lmmp)
+ if (*lmmp == NULL)
RETURN(-ENOMEM);
}
LASSERT(mea_size == mdsize);
OBD_ALLOC(*tmea, mea_size);
- /* FIXME: error handling here */
- LASSERT(*tmea != NULL);
+ if (*tmea == NULL)
+ RETURN(-ENOMEM);
if (!disk_src)
RETURN(mea_size);
if (rc)
RETURN(rc);
if (mea != NULL) {
- /* dir is already splitted, check is requested filename
+ /* dir is already splitted, check if requested filename
* should live at this MDS or at another one */
int i;
i = mea_name2idx(mea, name, namelen - 1);
int mds_lmv_connect(struct obd_device *obd, char * lmv_name)
{
struct mds_obd *mds = &obd->u.mds;
- struct lustre_handle conn = {0,};
- int valsize, mdsize;
- int rc;
+ struct lustre_handle conn = {0};
+ int rc, valsize, value;
ENTRY;
if (IS_ERR(mds->mds_lmv_obd))
rc = obd_register_observer(mds->mds_lmv_obd, obd);
if (rc) {
- CERROR("MDS cannot register as observer of LMV %s (%d)\n",
- lmv_name, rc);
+ CERROR("MDS cannot register as observer of LMV %s, "
+ "rc = %d\n", lmv_name, rc);
GOTO(err_discon, rc);
}
/* retrieve size of EA */
rc = obd_get_info(mds->mds_lmv_exp, strlen("mdsize"), "mdsize",
- &valsize, &mdsize);
+ &valsize, &value);
if (rc)
GOTO(err_reg, rc);
- if (mdsize > mds->mds_max_mdsize)
- mds->mds_max_mdsize = mdsize;
+
+ if (value > mds->mds_max_mdsize)
+ mds->mds_max_mdsize = value;
/* find our number in LMV cluster */
rc = obd_get_info(mds->mds_lmv_exp, strlen("mdsnum"), "mdsnum",
- &valsize, &mdsize);
+ &valsize, &value);
if (rc)
GOTO(err_reg, rc);
- mds->mds_num = mdsize;
+
+ mds->mds_num = value;
rc = obd_set_info(mds->mds_lmv_exp, strlen("inter_mds"),
- "inter_mds", 0, NULL);
+ "inter_mds", 0, NULL);
if (rc)
GOTO(err_reg, rc);
+
RETURN(0);
err_reg:
- RETURN(rc);
-
+ obd_register_observer(mds->mds_lmv_obd, NULL);
err_discon:
- /* FIXME: cleanups here! */
obd_disconnect(mds->mds_lmv_exp, 0);
mds->mds_lmv_exp = NULL;
mds->mds_lmv_obd = ERR_PTR(rc);
int mds_lmv_postsetup(struct obd_device *obd)
{
struct mds_obd *mds = &obd->u.mds;
+ int rc = 0;
ENTRY;
+
if (mds->mds_lmv_exp)
- obd_init_ea_size(mds->mds_lmv_exp, mds->mds_max_mdsize,
- mds->mds_max_cookiesize);
- RETURN(0);
+ rc = obd_init_ea_size(mds->mds_lmv_exp, mds->mds_max_mdsize,
+ mds->mds_max_cookiesize);
+
+ RETURN(rc);
}
int mds_lmv_disconnect(struct obd_device *obd, int flags)
ENTRY;
if (!IS_ERR(mds->mds_lmv_obd) && mds->mds_lmv_exp != NULL) {
-
obd_register_observer(mds->mds_lmv_obd, NULL);
+ /* if obd_disconnect fails (probably because the export was
+ * disconnected by class_disconnect_exports) then we just need
+ * to drop our ref. */
rc = obd_disconnect(mds->mds_lmv_exp, flags);
- /* if obd_disconnect fails (probably because the
- * export was disconnected by class_disconnect_exports)
- * then we just need to drop our ref. */
- if (rc != 0)
+ if (rc)
class_export_put(mds->mds_lmv_exp);
+
mds->mds_lmv_exp = NULL;
mds->mds_lmv_obd = NULL;
}
RETURN(rc);
}
-
int mds_get_lmv_attr(struct obd_device *obd, struct inode *inode,
- struct mea **mea, int *mea_size)
+ struct mea **mea, int *mea_size)
{
struct mds_obd *mds = &obd->u.mds;
int rc;
/* first calculate mea size */
*mea_size = obd_alloc_diskmd(mds->mds_lmv_exp,
(struct lov_mds_md **)mea);
- /* FIXME: error handling here */
- LASSERT(*mea != NULL);
+ if (*mea_size < 0 || *mea == NULL)
+ return *mea_size < 0 ? *mea_size : -EINVAL;
down(&inode->i_sem);
rc = fsfilt_get_md(obd, inode, *mea, *mea_size);
up(&inode->i_sem);
- /* FIXME: error handling here */
+
if (rc <= 0) {
OBD_FREE(*mea, *mea_size);
*mea = NULL;
- }
- if (rc > 0)
+ } else
rc = 0;
RETURN(rc);
}
/*
- * must not be called on already splitted directories
+ * must not be called on already splitted directories.
*/
-int mds_try_to_split_dir(struct obd_device *obd,
- struct dentry *dentry, struct mea **mea, int nstripes)
+int mds_try_to_split_dir(struct obd_device *obd, struct dentry *dentry,
+ struct mea **mea, int nstripes)
{
struct inode *dir = dentry->d_inode;
struct mds_obd *mds = &obd->u.mds;
/* TODO: optimization possible - we already may have mea here */
if (mds_splitting_expected(obd, dentry) != MDS_EXPECT_SPLIT)
- return 0;
+ RETURN(0);
+
LASSERT(mea == NULL || *mea == NULL);
CDEBUG(D_OTHER, "%s: split directory %u/%lu/%lu\n",
* necessary amount of stripes, but on the other hand with this
* approach of allocating maximal possible amount of MDS slots,
* it would be easier to split the dir over more MDSes */
- rc = obd_alloc_diskmd(mds->mds_lmv_exp, (void *) mea);
- if (!(*mea))
- RETURN(-ENOMEM);
+ rc = obd_alloc_diskmd(mds->mds_lmv_exp, (void *)mea);
+ if (rc < 0) {
+ CERROR("obd_alloc_diskmd() failed, error %d.\n", rc);
+ RETURN(rc);
+ }
+ if (*mea == NULL)
+ RETURN(-EINVAL);
+
(*mea)->mea_count = nstripes;
/* 1) create directory objects on slave MDS'es */
/* FIXME: should this be OBD method? */
oa = obdo_alloc();
- /* FIXME: error handling here */
- LASSERT(oa != NULL);
+ if (!oa)
+ RETURN(-ENOMEM);
+
oa->o_id = dir->i_ino;
oa->o_generation = dir->i_generation;
- obdo_from_inode(oa, dir, OBD_MD_FLTYPE | OBD_MD_FLATIME |
+
+ obdo_from_inode(oa, dir, OBD_MD_FLTYPE | OBD_MD_FLATIME |
OBD_MD_FLMTIME | OBD_MD_FLCTIME |
OBD_MD_FLUID | OBD_MD_FLGID);
+
oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
oa->o_valid |= OBD_MD_FLID | OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
oa->o_mode = dir->i_mode;
+
CDEBUG(D_OTHER, "%s: create subdirs with mode %o, uid %u, gid %u\n",
obd->obd_name, dir->i_mode, dir->i_uid, dir->i_gid);
rc = obd_create(mds->mds_lmv_exp, oa,
- (struct lov_stripe_md **) mea, NULL);
- /* FIXME: error handling here */
- LASSERT(rc == 0);
- CDEBUG(D_OTHER, "%d dirobjects created\n",
- (int) (*mea)->mea_count);
+ (struct lov_stripe_md **)mea, NULL);
+ if (rc)
+ GOTO(err_oa, rc);
+
+ CDEBUG(D_OTHER, "%d dirobjects created\n", (int)(*mea)->mea_count);
/* 2) update dir attribute */
down(&dir->i_sem);
+
handle = fsfilt_start(obd, dir, FSFILT_OP_SETATTR, NULL);
- LASSERT(!IS_ERR(handle));
+ if (IS_ERR(handle)) {
+ up(&dir->i_sem);
+ CERROR("fsfilt_start() failed, error %d.\n",
+ PTR_ERR(handle));
+ GOTO(err_oa, rc = PTR_ERR(handle));
+ }
+
rc = fsfilt_set_md(obd, dir, handle, *mea, mea_size);
- LASSERT(rc == 0);
- fsfilt_commit(obd, mds->mds_sb, dir, handle, 0);
- LASSERT(rc == 0);
+ if (rc) {
+ up(&dir->i_sem);
+ CERROR("fsfilt_set_md() failed, error %d.\n", rc);
+ GOTO(err_oa, rc);
+ }
+
+ rc = fsfilt_commit(obd, mds->mds_sb, dir, handle, 0);
+ if (rc) {
+ up(&dir->i_sem);
+ CERROR("fsfilt_commit() failed, error %d.\n", rc);
+ GOTO(err_oa, rc);
+ }
+
up(&dir->i_sem);
obdo_free(oa);
/* 3) read through the dir and distribute it over objects */
- scan_and_distribute(obd, dentry, *mea);
+ rc = scan_and_distribute(obd, dentry, *mea);
+ if (rc) {
+ CERROR("scan_and_distribute() failed, error %d.\n",
+ rc);
+ RETURN(rc);
+ }
if (mea == &tmea)
obd_free_diskmd(mds->mds_lmv_exp,
- (struct lov_mds_md **) mea);
+ (struct lov_mds_md **)mea);
RETURN(1);
+
+err_oa:
+ obdo_free(oa);
+ RETURN(rc);
}
static int filter_start_page_write(struct inode *inode,
/* dir got splitted */
GOTO(cleanup, rc = -ERESTART);
} else {
- /* error happened during spitting */
+ /* error happened during spitting. */
GOTO(cleanup, rc);
}
}
/* as Peter asked, mkdir() should distribute new directories
* over the whole cluster in order to distribute namespace
- * processing load. first, we calculate which MDS to use to
- * put new directory's inode in */
+ * processing load. first, we calculate which MDS to use to put
+ * new directory's inode in. */
i = mds_choose_mdsnum(obd, rec->ur_name, rec->ur_namelen - 1,
rec->ur_flags);
if (i == mds->mds_num) {
/* inode will be created locally */
-
handle = fsfilt_start(obd, dir, FSFILT_OP_MKDIR, NULL);
if (IS_ERR(handle))
GOTO(cleanup, rc = PTR_ERR(handle));
nstripes = *(u16 *)rec->ur_eadata;
if (rc == 0 && nstripes) {
- /* FIXME: error handling here */
- mds_try_to_split_dir(obd, dchild,
- NULL, nstripes);
+ if ((rc = mds_try_to_split_dir(obd, dchild,
+ NULL, nstripes))) {
+ if (rc > 0) {
+ /* dir got splitted */
+ rc = 0;
+ } else {
+ /* an error occured during
+ * splitting. */
+ GOTO(cleanup, rc);
+ }
+ }
}
} else if (!DENTRY_VALID(dchild)) {
/* inode will be created on another MDS */
err = mds_finish_transno(mds, dir, handle, req, rc, 0);
if (rc && created) {
- /* Destroy the file we just created. This should not need
- * extra journal credits, as we have already modified all of
- * the blocks needed in order to create the file in the first
- * place.
- */
+ /* Destroy the file we just created. This should not need extra
+ * journal credits, as we have already modified all of the
+ * blocks needed in order to create the file in the first
+ * place. */
switch (type) {
case S_IFDIR:
err = vfs_rmdir(dir, dchild);
}
static int mds_reint_rename(struct mds_update_record *rec, int offset,
- struct ptlrpc_request *req,
- struct lustre_handle *lockh)
+ struct ptlrpc_request *req, struct lustre_handle *lockh)
{
struct obd_device *obd = req->rq_export->exp_obd;
struct dentry *de_srcdir = NULL;
if (de_old->d_inode->i_ino == de_srcdir->d_inode->i_ino ||
de_old->d_inode->i_ino == de_tgtdir->d_inode->i_ino)
GOTO(cleanup, rc = -EINVAL);
-
+
/* sanity check for dest inode */
if (de_new->d_inode &&
(de_new->d_inode->i_ino == de_srcdir->d_inode->i_ino ||
static int filter_precreate_rec(struct obd_device *obd, struct dentry *dentry,
int *number, struct obdo *oa)
{
- int rc = 0;
+ int rc;
ENTRY;
rc = fsfilt_precreate_rec(obd, dentry, number, oa);
RETURN(rc);
}
+
/* We rely on the fact that only one thread will be creating files in a given
* group at a time, which is why we don't need an atomic filter_get_new_id.
* Even if we had that atomic function, the following race would exist:
if (rc)
break;
}
+
*num = i;
- rc = filter_precreate_rec(obd, dparent, num, oa);
+ /* check if we have an error after ll_vfs_create(). It is possible that
+ * there will be say -ENOSPC and we will leak it. */
+ if (rc == 0)
+ rc = filter_precreate_rec(obd, dparent, num, oa);
up(&filter->fo_create_lock);
CDEBUG(D_HA, "%s: filter_precreate() created %d objects\n",
obd->obd_name, i);
+
RETURN(rc);
}
ONLY=${ONLY:-"$*"}
# bug number for skipped test: 2108
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"24a 24b 24c 24d 24e 24f 24g 24h 24i 24j 24k 24l 24m 24n 58"}
+RENAME_TESTS="24a 24b 24c 24d 24e 24f 24g 24h 24i 24j 24k 24l 24m 24n 24o 48a 48d"
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"$RENAME_TESTS 58"}
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
case `uname -r` in
2.6.*) ALWAYS_EXCEPT="$ALWAYS_EXCEPT 54c 55" # bug 3117
git://git.whamcloud.com / fs / lustre-release.git / commitdiff