staging: lustre: remove RETURN macro

[linux-2.6-block.git] / drivers / staging / lustre / lustre / obdclass / md_attrs.c

diff --git a/drivers/staging/lustre/lustre/obdclass/md_attrs.c b/drivers/staging/lustre/lustre/obdclass/md_attrs.c
index b71344a04c7ee00c72edc8af11f6b9fdfe90793d..f7187829e276fb5c5558ea5ccecc7ac776751b7b 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/md_attrs.c
+++ b/drivers/staging/lustre/lustre/obdclass/md_attrs.c
@@ -99,19 +99,18 @@ EXPORT_SYMBOL(lustre_som_swab);
 int lustre_buf2som(void *buf, int rc, struct md_som_data *msd)
 {
        struct som_attrs *attrs = (struct som_attrs *)buf;
-       ENTRY;
 
        if (rc == 0 ||  rc == -ENODATA)
                /* no SOM attributes */
-               RETURN(-ENODATA);
+               return -ENODATA;
 
        if (rc < 0)
                /* error hit while fetching xattr */
-               RETURN(rc);
+               return rc;
 
        /* check SOM compatibility */
        if (attrs->som_incompat & ~cpu_to_le32(SOM_INCOMPAT_SUPP))
-               RETURN(-ENODATA);
+               return -ENODATA;
 
        /* unpack SOM attributes */
        lustre_som_swab(attrs);
@@ -124,7 +123,7 @@ int lustre_buf2som(void *buf, int rc, struct md_som_data *msd)
        msd->msd_blocks   = attrs->som_blocks;
        msd->msd_mountid  = attrs->som_mountid;
 
-       RETURN(0);
+       return 0;
 }
 EXPORT_SYMBOL(lustre_buf2som);
 
@@ -156,15 +155,14 @@ EXPORT_SYMBOL(lustre_hsm_swab);
 int lustre_buf2hsm(void *buf, int rc, struct md_hsm *mh)
 {
        struct hsm_attrs *attrs = (struct hsm_attrs *)buf;
-       ENTRY;
 
        if (rc == 0 ||  rc == -ENODATA)
                /* no HSM attributes */
-               RETURN(-ENODATA);
+               return -ENODATA;
 
        if (rc < 0)
                /* error hit while fetching xattr */
-               RETURN(rc);
+               return rc;
 
        /* unpack HSM attributes */
        lustre_hsm_swab(attrs);
@@ -175,7 +173,7 @@ int lustre_buf2hsm(void *buf, int rc, struct md_hsm *mh)
        mh->mh_arch_id  = attrs->hsm_arch_id;
        mh->mh_arch_ver = attrs->hsm_arch_ver;
 
-       RETURN(0);
+       return 0;
 }
 EXPORT_SYMBOL(lustre_buf2hsm);
 
@@ -188,7 +186,6 @@ EXPORT_SYMBOL(lustre_buf2hsm);
 void lustre_hsm2buf(void *buf, struct md_hsm *mh)
 {
        struct hsm_attrs *attrs = (struct hsm_attrs *)buf;
-       ENTRY;
 
        /* copy HSM attributes */
        attrs->hsm_compat   = mh->mh_compat;