staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / llite / remote_perm.c

diff --git a/drivers/staging/lustre/lustre/llite/remote_perm.c b/drivers/staging/lustre/lustre/llite/remote_perm.c
index 1d29d7ccb70cca6f89f092f4145f3337a8a9a0d5..dedd56ae1e6d52f2ee3bab2fe209c2d42f928a14 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/remote_perm.c
+++ b/drivers/staging/lustre/lustre/llite/remote_perm.c
@@ -125,7 +125,7 @@ static int do_check_remote_perm(struct ll_inode_info *lli, int mask)
        int found = 0, rc;
 
        if (!lli->lli_remote_perms)
-               RETURN(-ENOENT);
+               return -ENOENT;
 
        head = lli->lli_remote_perms +
                remote_perm_hashfunc(from_kuid(&init_user_ns, current_uid()));
@@ -176,7 +176,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm)
                       perm->rp_uid, perm->rp_gid, perm->rp_fsuid,
                       perm->rp_fsgid, current->uid, current->gid,
                       current->fsuid, current->fsgid);
-               RETURN(-EAGAIN);
+               return -EAGAIN;
        }
 #endif
 
@@ -184,7 +184,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm)
                perm_hash = alloc_rmtperm_hash();
                if (perm_hash == NULL) {
                        CERROR("alloc lli_remote_perms failed!\n");
-                       RETURN(-ENOMEM);
+                       return -ENOMEM;
                }
        }
 
@@ -218,7 +218,7 @@ again:
                lrp = alloc_ll_remote_perm();
                if (!lrp) {
                        CERROR("alloc memory for ll_remote_perm failed!\n");
-                       RETURN(-ENOMEM);
+                       return -ENOMEM;
                }
                spin_lock(&lli->lli_lock);
                goto again;
@@ -239,7 +239,7 @@ again:
               lrp, lrp->lrp_uid, lrp->lrp_gid, lrp->lrp_fsuid, lrp->lrp_fsgid,
               lrp->lrp_access_perm);
 
-       RETURN(0);
+       return 0;
 }
 
 int lustre_check_remote_perm(struct inode *inode, int mask)
@@ -301,7 +301,7 @@ int lustre_check_remote_perm(struct inode *inode, int mask)
                req = NULL;
        } while (1);
        ptlrpc_req_finished(req);
-       RETURN(rc);
+       return rc;
 }
 
 #if 0  /* NB: remote perms can't be freed in ll_mdc_blocking_ast of UPDATE lock,