LU-6142 lmv: Fix style issues for lmv_fld.c

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

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index 2f5b594..db45c4b 100644 (file)
--- a/lustre/lmv/lmv_fld.c
+++ b/lustre/lmv/lmv_fld.c
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -44,7 +40,6 @@
 #include <linux/seq_file.h>
 
 #include <obd_support.h>
-#include <lustre/lustre_idl.h>
 #include <lustre_fid.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
@@ -57,32 +52,37 @@ int lmv_fld_lookup(struct lmv_obd *lmv, const struct lu_fid *fid, u32 *mds)
 {
        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 */
+       /*
+        * 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 = -EINVAL;
+               CERROR("%s: invalid FID "DFID": rc = %d\n", obd->obd_name,
+                      PFID(fid), rc);
+               RETURN(rc);
        }
 
        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 %#llx"
-                       ", err = %d\n", fid_seq(fid), rc);
-                RETURN(rc);
-        }
+                              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->desc.ld_tgt_count) {
+               rc = -EINVAL;
+               CERROR("%s: FLD lookup got invalid mds #%x (max: %x) for fid="DFID": rc = %d\n",
+                      obd->obd_name, *mds, lmv->desc.ld_tgt_count, PFID(fid),
+                      rc);
+       }
+       RETURN(rc);
 }