Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-12624 obdclass: lu_tgt_descs cleanup
[fs/lustre-release.git]
/
lustre
/
lmv
/
lmv_fld.c
diff --git
a/lustre/lmv/lmv_fld.c
b/lustre/lmv/lmv_fld.c
index
b439d87
..
f31b1b9
100644
(file)
--- a/
lustre/lmv/lmv_fld.c
+++ b/
lustre/lmv/lmv_fld.c
@@
-52,32
+52,37
@@
int lmv_fld_lookup(struct lmv_obd *lmv, const struct lu_fid *fid, u32 *mds)
{
struct obd_device *obd = lmv2obd_dev(lmv);
int rc;
+
ENTRY;
- /* FIXME: Currently ZFS still use local seq for ROOT unfortunately, and
- * this fid_is_local check should be removed once LU-2240 is fixed */
+ /*
+ * FIXME: Currently ZFS still use local seq for ROOT unfortunately, and
+ * this fid_is_local check should be removed once LU-2240 is fixed
+ */
if (!fid_is_sane(fid) || !(fid_seq_in_fldb(fid_seq(fid)) ||
fid_seq_is_local_file(fid_seq(fid)))) {
- CERROR("%s: invalid FID "DFID"\n", obd->obd_name, PFID(fid));
- RETURN(-EINVAL);
+ rc = -EINVAL;
+ CERROR("%s: invalid FID "DFID": rc = %d\n", obd->obd_name,
+ PFID(fid), rc);
+ RETURN(rc);
}
rc = fld_client_lookup(&lmv->lmv_fld, fid_seq(fid), mds,
-
LU_SEQ_RANGE_MDT, NULL);
-
if (rc) {
- CERROR("
Error while looking for mds number. Seq %#llx"
-
", err = %d\n"
, fid_seq(fid), rc);
-
RETURN(rc);
-
}
+ LU_SEQ_RANGE_MDT, NULL);
+ if (rc) {
+ CERROR("
%s: Error while looking for mds number. Seq %#llx: rc = %d\n",
+
obd->obd_name
, fid_seq(fid), rc);
+ RETURN(rc);
+ }
-
CDEBUG(D_INODE, "FLD lookup got mds #%x for fid="DFID"\n",
-
*mds, PFID(fid));
+ CDEBUG(D_INODE, "FLD lookup got mds #%x for fid="DFID"\n",
+ *mds, PFID(fid));
-
if (*mds >= lmv->desc.ld_tgt_count
) {
- CERROR("FLD lookup got invalid mds #%x (max: %x) "
-
"for fid="DFID"\n", *mds, lmv->desc.ld_tgt_count
,
- PFID(fid));
-
rc = -EINVAL
;
-
}
-
RETURN(rc);
+
if (*mds >= lmv->lmv_mdt_descs.ltd_tgts_size
) {
+ rc = -EINVAL;
+
CERROR("%s: FLD lookup got invalid mds #%x (max: %x) for fid="DFID": rc = %d\n"
,
+ obd->obd_name, *mds, lmv->lmv_mdt_descs.ltd_tgts_size,
+
PFID(fid), rc)
;
+ }
+ RETURN(rc);
}