X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flmv%2Flmv_fld.c;h=fc7f4bdf93b80ca410204853dfd472b59adc6fcf;hp=b630bbc267cf2828a9876816fddc8a7fc1b36954;hb=79d06b6fac3d18f2e5755a940e8afa42e70f3ba2;hpb=bad2b3e71c887d58d7834f5e4187c29e36c4b1ab

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index b630bbc26..fc7f4bd 100644
--- a/lustre/lmv/lmv_fld.c
+++ b/lustre/lmv/lmv_fld.c
@@ -64,16 +64,12 @@ int lmv_fld_lookup(struct lmv_obd *lmv,
 	int rc;
 	ENTRY;
 
-	LASSERTF(fid_is_sane(fid), DFID" is insane!\n", PFID(fid));
 
-	/* FIXME: Because ZFS still use LOCAL fid sequence for root,
-	 * and root will always be in MDT0, for local fid, it will
-	 * return 0 directly. And it should be removed once the root
-	 * FID has been assigned with special sequence */
-	if (fid_seq(fid) == FID_SEQ_LOCAL_FILE) {
-		*mds = 0;
-		RETURN(0);
-	}
+	/* FIXME: Currently ZFS still use local seq for ROOT unfortunately, and
+	 * this fid_is_local check should be removed once LU-2240 is fixed */
+	LASSERTF((fid_seq_in_fldb(fid_seq(fid)) ||
+		  fid_seq_is_local_file(fid_seq(fid))) &&
+		 fid_is_sane(fid), DFID" is insane!\n", PFID(fid));
 
 	rc = fld_client_lookup(&lmv->lmv_fld, fid_seq(fid), mds,
                                LU_SEQ_RANGE_MDT, NULL);