staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / lmv / lmv_fld.c

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_fld.c b/drivers/staging/lustre/lustre/lmv/lmv_fld.c
index a4805aefa6845d092e32138d44cf3d2793894c6a..0b2d38d1362b7a2fc796833862cca77d01d3021a 100644 (file)
--- a/drivers/staging/lustre/lustre/lmv/lmv_fld.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_fld.c
@@ -38,7 +38,6 @@
 #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/seq_file.h>
@@ -58,8 +57,6 @@ int lmv_fld_lookup(struct lmv_obd *lmv,
                   mdsno_t *mds)
 {
        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 */
@@ -72,7 +69,7 @@ int lmv_fld_lookup(struct lmv_obd *lmv,
        if (rc) {
                CERROR("Error while looking for mds number. Seq "LPX64
                       ", err = %d\n", fid_seq(fid), rc);
-               RETURN(rc);
+               return rc;
        }
 
        CDEBUG(D_INODE, "FLD lookup got mds #%x for fid="DFID"\n",
@@ -84,5 +81,5 @@ int lmv_fld_lookup(struct lmv_obd *lmv,
                       PFID(fid));
                rc = -EINVAL;
        }
-       RETURN(rc);
+       return rc;
 }