staging: lustre: remove RETURN macro

[karo-tx-linux.git] / drivers / staging / lustre / lustre / ptlrpc / recover.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/recover.c b/drivers/staging/lustre/lustre/ptlrpc/recover.c
index 29a9f0acc67209d126029b51e9a2d5bd8bc1202f..84c39e083ea4bef97acfdabb2d2424cd76540b58 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/recover.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/recover.c
@@ -62,8 +62,6 @@ void ptlrpc_initiate_recovery(struct obd_import *imp)
 {
        CDEBUG(D_HA, "%s: starting recovery\n", obd2cli_tgt(imp->imp_obd));
        ptlrpc_connect_import(imp);
-
-       EXIT;
 }
 
 /**
@@ -134,11 +132,11 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
                if (rc) {
                        CERROR("recovery replay error %d for req "
                               LPU64"\n", rc, req->rq_xid);
-                       RETURN(rc);
+                       return rc;
                }
                *inflight = 1;
        }
-       RETURN(rc);
+       return rc;
 }
 
 /**
@@ -158,7 +156,7 @@ int ptlrpc_resend(struct obd_import *imp)
        spin_lock(&imp->imp_lock);
        if (imp->imp_state != LUSTRE_IMP_RECOVER) {
                spin_unlock(&imp->imp_lock);
-               RETURN(-1);
+               return -1;
        }
 
        list_for_each_entry_safe(req, next, &imp->imp_sending_list,
@@ -171,7 +169,7 @@ int ptlrpc_resend(struct obd_import *imp)
        }
        spin_unlock(&imp->imp_lock);
 
-       RETURN(0);
+       return 0;
 }
 EXPORT_SYMBOL(ptlrpc_resend);
 
@@ -224,8 +222,6 @@ void ptlrpc_request_handle_notconn(struct ptlrpc_request *failed_req)
        if (!failed_req->rq_no_resend)
                failed_req->rq_resend = 1;
        spin_unlock(&failed_req->rq_lock);
-
-       EXIT;
 }
 
 /**
@@ -272,7 +268,7 @@ int ptlrpc_set_import_active(struct obd_import *imp, int active)
                rc = ptlrpc_recover_import(imp, NULL, 0);
        }
 
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(ptlrpc_set_import_active);
 
@@ -329,7 +325,6 @@ int ptlrpc_recover_import(struct obd_import *imp, char *new_uuid, int async)
                CDEBUG(D_HA, "%s: recovery finished\n",
                       obd2cli_tgt(imp->imp_obd));
        }
-       EXIT;
 
 out:
        return rc;