staging: lustre: remove RETURN macro

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

diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index 47a3c05127392a5813061c9b1d317dff1fb3d5be..2cdbb4d909c97eb5758345e467bab5003d5fd208 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -195,7 +195,6 @@ int ptlrpc_set_import_discon(struct obd_import *imp, __u32 conn_cnt)
 /* Must be called with imp_lock held! */
 static void ptlrpc_deactivate_and_unlock_import(struct obd_import *imp)
 {
-       ENTRY;
        LASSERT(spin_is_locked(&imp->imp_lock));
 
        CDEBUG(D_HA, "setting import %s INVALID\n", obd2cli_tgt(imp->imp_obd));
@@ -205,8 +204,6 @@ static void ptlrpc_deactivate_and_unlock_import(struct obd_import *imp)
 
        ptlrpc_abort_inflight(imp);
        obd_import_event(imp->imp_obd, imp, IMP_EVENT_INACTIVE);
-
-       EXIT;
 }
 
 /*
@@ -394,8 +391,6 @@ EXPORT_SYMBOL(ptlrpc_activate_import);
 
 void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt)
 {
-       ENTRY;
-
        LASSERT(!imp->imp_dlm_fake);
 
        if (ptlrpc_set_import_discon(imp, conn_cnt)) {
@@ -417,7 +412,6 @@ void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt)
 
                ptlrpc_pinger_wake_up();
        }
-       EXIT;
 }
 EXPORT_SYMBOL(ptlrpc_fail_import);
 
@@ -461,7 +455,6 @@ static int import_select_connection(struct obd_import *imp)
        struct obd_export *dlmexp;
        char *target_start;
        int target_len, tried_all = 1;
-       ENTRY;
 
        spin_lock(&imp->imp_lock);
 
@@ -469,7 +462,7 @@ static int import_select_connection(struct obd_import *imp)
                CERROR("%s: no connections available\n",
                       imp->imp_obd->obd_name);
                spin_unlock(&imp->imp_lock);
-               RETURN(-EINVAL);
+               return -EINVAL;
        }
 
        list_for_each_entry(conn, &imp->imp_conn_list, oic_item) {
@@ -558,7 +551,7 @@ static int import_select_connection(struct obd_import *imp)
 
        spin_unlock(&imp->imp_lock);
 
-       RETURN(0);
+       return 0;
 }
 
 /*
@@ -602,21 +595,20 @@ int ptlrpc_connect_import(struct obd_import *imp)
                         (char *)&imp->imp_connect_data };
        struct ptlrpc_connect_async_args *aa;
        int rc;
-       ENTRY;
 
        spin_lock(&imp->imp_lock);
        if (imp->imp_state == LUSTRE_IMP_CLOSED) {
                spin_unlock(&imp->imp_lock);
                CERROR("can't connect to a closed import\n");
-               RETURN(-EINVAL);
+               return -EINVAL;
        } else if (imp->imp_state == LUSTRE_IMP_FULL) {
                spin_unlock(&imp->imp_lock);
                CERROR("already connected\n");
-               RETURN(0);
+               return 0;
        } else if (imp->imp_state == LUSTRE_IMP_CONNECTING) {
                spin_unlock(&imp->imp_lock);
                CERROR("already connecting\n");
-               RETURN(-EALREADY);
+               return -EALREADY;
        }
 
        IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CONNECTING);
@@ -716,7 +708,7 @@ out:
                IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
        }
 
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(ptlrpc_connect_import);
 
@@ -756,13 +748,12 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
        struct obd_connect_data *ocd;
        struct obd_export *exp;
        int ret;
-       ENTRY;
 
        spin_lock(&imp->imp_lock);
        if (imp->imp_state == LUSTRE_IMP_CLOSED) {
                imp->imp_connect_tried = 1;
                spin_unlock(&imp->imp_lock);
-               RETURN(0);
+               return 0;
        }
 
        if (rc) {
@@ -984,7 +975,7 @@ finish:
                               imp->imp_connection->c_remote_uuid.uuid);
                        ptlrpc_connect_import(imp);
                        imp->imp_connect_tried = 1;
-                       RETURN(0);
+                       return 0;
                }
        } else {
 
@@ -1137,7 +1128,7 @@ out:
 
                        /* reply message might not be ready */
                        if (request->rq_repmsg == NULL)
-                               RETURN(-EPROTO);
+                               return -EPROTO;
 
                        ocd = req_capsule_server_get(&request->rq_pill,
                                                     &RMF_CONNECT_DATA);
@@ -1161,7 +1152,7 @@ out:
                                ptlrpc_deactivate_import(imp);
                                IMPORT_SET_STATE(imp, LUSTRE_IMP_CLOSED);
                        }
-                       RETURN(-EPROTO);
+                       return -EPROTO;
                }
 
                ptlrpc_maybe_ping_import_soon(imp);
@@ -1172,7 +1163,7 @@ out:
        }
 
        wake_up_all(&imp->imp_recovery_waitq);
-       RETURN(rc);
+       return rc;
 }
 
 /**
@@ -1183,7 +1174,6 @@ static int completed_replay_interpret(const struct lu_env *env,
                                      struct ptlrpc_request *req,
                                      void * data, int rc)
 {
-       ENTRY;
        atomic_dec(&req->rq_import->imp_replay_inflight);
        if (req->rq_status == 0 &&
            !req->rq_import->imp_vbr_failed) {
@@ -1202,7 +1192,7 @@ static int completed_replay_interpret(const struct lu_env *env,
                ptlrpc_connect_import(req->rq_import);
        }
 
-       RETURN(0);
+       return 0;
 }
 
 /**
@@ -1212,10 +1202,9 @@ static int completed_replay_interpret(const struct lu_env *env,
 static int signal_completed_replay(struct obd_import *imp)
 {
        struct ptlrpc_request *req;
-       ENTRY;
 
        if (unlikely(OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_FINISH_REPLAY)))
-               RETURN(0);
+               return 0;
 
        LASSERT(atomic_read(&imp->imp_replay_inflight) == 0);
        atomic_inc(&imp->imp_replay_inflight);
@@ -1224,7 +1213,7 @@ static int signal_completed_replay(struct obd_import *imp)
                                        OBD_PING);
        if (req == NULL) {
                atomic_dec(&imp->imp_replay_inflight);
-               RETURN(-ENOMEM);
+               return -ENOMEM;
        }
 
        ptlrpc_request_set_replen(req);
@@ -1236,7 +1225,7 @@ static int signal_completed_replay(struct obd_import *imp)
        req->rq_interpret_reply = completed_replay_interpret;
 
        ptlrpcd_add_req(req, PDL_POLICY_ROUND, -1);
-       RETURN(0);
+       return 0;
 }
 
 /**
@@ -1248,8 +1237,6 @@ static int ptlrpc_invalidate_import_thread(void *data)
 {
        struct obd_import *imp = data;
 
-       ENTRY;
-
        unshare_fs_struct();
 
        CDEBUG(D_HA, "thread invalidate import %s to %s@%s\n",
@@ -1267,7 +1254,7 @@ static int ptlrpc_invalidate_import_thread(void *data)
        ptlrpc_import_recovery_state_machine(imp);
 
        class_import_put(imp);
-       RETURN(0);
+       return 0;
 }
 
 /**
@@ -1297,7 +1284,6 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
        char *target_start;
        int target_len;
 
-       ENTRY;
        if (imp->imp_state == LUSTRE_IMP_EVICTED) {
                deuuidify(obd2cli_tgt(imp->imp_obd), NULL,
                          &target_start, &target_len);
@@ -1334,7 +1320,7 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
                } else {
                        rc = 0;
                }
-               RETURN(rc);
+               return rc;
                }
        }
 
@@ -1393,7 +1379,7 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
        }
 
 out:
-       RETURN(rc);
+       return rc;
 }
 
 int ptlrpc_disconnect_import(struct obd_import *imp, int noclose)
@@ -1401,7 +1387,6 @@ int ptlrpc_disconnect_import(struct obd_import *imp, int noclose)
        struct ptlrpc_request *req;
        int rq_opc, rc = 0;
        int nowait = imp->imp_obd->obd_force;
-       ENTRY;
 
        if (nowait)
                GOTO(set_state, rc);
@@ -1413,7 +1398,7 @@ int ptlrpc_disconnect_import(struct obd_import *imp, int noclose)
        default:
                CERROR("don't know how to disconnect from %s (connect_op %d)\n",
                       obd2cli_tgt(imp->imp_obd), imp->imp_connect_op);
-               RETURN(-EINVAL);
+               return -EINVAL;
        }
 
        if (ptlrpc_import_in_recovery(imp)) {
@@ -1476,21 +1461,17 @@ out:
        memset(&imp->imp_remote_handle, 0, sizeof(imp->imp_remote_handle));
        spin_unlock(&imp->imp_lock);
 
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(ptlrpc_disconnect_import);
 
 void ptlrpc_cleanup_imp(struct obd_import *imp)
 {
-       ENTRY;
-
        spin_lock(&imp->imp_lock);
        IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CLOSED);
        imp->imp_generation++;
        spin_unlock(&imp->imp_lock);
        ptlrpc_abort_inflight(imp);
-
-       EXIT;
 }
 EXPORT_SYMBOL(ptlrpc_cleanup_imp);