LU-7433 ldlm: xattr locks are lost on mdt

[fs/lustre-release.git] / lustre / lmv / lmv_fld.c

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index 62eb0d7..2f5b594 100644 (file)
--- a/lustre/lmv/lmv_fld.c
+++ b/lustre/lmv/lmv_fld.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,17 +35,13 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LMV
-#ifdef __KERNEL__
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/pagemap.h>
-#include <asm/div64.h>
+#include <linux/math64.h>
 #include <linux/seq_file.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <lustre/lustre_idl.h>
@@ -57,28 +53,24 @@
 #include <lprocfs_status.h>
 #include "lmv_internal.h"
 
-int lmv_fld_lookup(struct lmv_obd *lmv,
-                   const struct lu_fid *fid,
-                   mdsno_t *mds)
+int lmv_fld_lookup(struct lmv_obd *lmv, const struct lu_fid *fid, u32 *mds)
 {
-        int rc;
-        ENTRY;
+       struct obd_device *obd = lmv2obd_dev(lmv);
+       int rc;
+       ENTRY;
 
-        LASSERT(fid_is_sane(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 */
+       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 = 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 "LPX64
+               CERROR("Error while looking for mds number. Seq %#llx"
                        ", err = %d\n", fid_seq(fid), rc);
                 RETURN(rc);
         }