X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flmv%2Flmv_fld.c;h=4dfce3a0158b7b1532e18c86d0d9053c20a5391a;hb=c49ff6ff89725052a29aa91d780a881e7829dfa2;hp=f9b6a3ae83fdf738012b31fe4bbf4826b2ea9bc0;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index f9b6a3a..4dfce3a 100644
--- a/lustre/lmv/lmv_fld.c
+++ b/lustre/lmv/lmv_fld.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -34,9 +32,6 @@
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_LMV
 #ifdef __KERNEL__
 #include <linux/slab.h>
@@ -50,8 +45,8 @@
 #include <liblustre.h>
 #endif
 
-#include <lustre/lustre_idl.h>
 #include <obd_support.h>
+#include <lustre/lustre_idl.h>
 #include <lustre_fid.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
@@ -68,19 +63,31 @@ int lmv_fld_lookup(struct lmv_obd *lmv,
         ENTRY;
 
         LASSERT(fid_is_sane(fid));
-        rc = fld_client_lookup(&lmv->lmv_fld, fid_seq(fid), mds, NULL);
+
+	/* 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);
+	}
+
+	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 "LPU64
+                CERROR("Error while looking for mds number. Seq "LPX64
                        ", err = %d\n", fid_seq(fid), rc);
                 RETURN(rc);
         }
-        
-        CDEBUG(D_INFO, "Got mds "LPU64" for sequence: "LPU64"\n",
-               *mds, fid_seq(fid));
+
+        CDEBUG(D_INODE, "FLD lookup got mds #%x for fid="DFID"\n",
+               *mds, PFID(fid));
 
         if (*mds >= lmv->desc.ld_tgt_count) {
-                CERROR("Got invalid mds: "LPU64" (max: %d)\n",
-                       *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);