X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flmv%2Flmv_fld.c;h=2f5b59403dfa30613d9ad1e1126a7aaa2b3f34cb;hb=1cb9e85039c8df5fbe061aad3b0666c59ff7aa4e;hp=c2b97571019e5c4686358c39fdd8079daa13fa2a;hpb=54e6e2442374d11ba55518b552f7230a989c9b1c;p=fs%2Flustre-release.git

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index c2b9757..2f5b594 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.
@@ -26,32 +24,27 @@
  * 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.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * 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>
 #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 <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>
@@ -60,26 +53,33 @@
 #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;
+
+	/* 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);
+	}
 
-        LASSERT(fid_is_sane(fid));
-        rc = fld_client_lookup(&lmv->lmv_fld, fid_seq(fid), mds, NULL);
+	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 %#llx"
                        ", err = %d\n", fid_seq(fid), rc);
                 RETURN(rc);
         }
-        
-        CDEBUG(D_INODE, "FLD lookup got mds #"LPU64" for fid="DFID"\n",
+
+        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 #"LPU64" (max: %d) "
+                CERROR("FLD lookup got invalid mds #%x (max: %x) "
                        "for fid="DFID"\n", *mds, lmv->desc.ld_tgt_count,
                        PFID(fid));
                 rc = -EINVAL;