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 8d111d9..f31b1b9 100644 (file)
--- 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.
@@ -17,41 +15,31 @@
  *
  * You should have received a copy of the GNU General Public License
  * 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
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * 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 <obd_support.h>
-#include <lustre/lustre_idl.h>
 #include <lustre_fid.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
@@ -60,30 +48,41 @@
 #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)))) {
+               rc = -EINVAL;
+               CERROR("%s: invalid FID "DFID": rc = %d\n", obd->obd_name,
+                      PFID(fid), rc);
+               RETURN(rc);
+       }
 
-        LASSERT(fid_is_sane(fid));
-        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
-                       ", err = %d\n", fid_seq(fid), rc);
-                RETURN(rc);
-        }
+       rc = fld_client_lookup(&lmv->lmv_fld, fid_seq(fid), mds,
+                              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);
 }