LU-3810 obd: Cleanup client import if client_obd_setup fails

[fs/lustre-release.git] / lustre / mgc / mgc_request.c

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 94b8d8d..64ab255 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -893,27 +893,27 @@ static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
        struct lprocfs_static_vars      lvars;
        int                             rc;
 {
        struct lprocfs_static_vars      lvars;
        int                             rc;

-        ENTRY;
+       ENTRY;

 
        rc = ptlrpcd_addref();
        if (rc < 0)
                RETURN(rc);
 
 
        rc = ptlrpcd_addref();
        if (rc < 0)
                RETURN(rc);
 

-        rc = client_obd_setup(obd, lcfg);
-        if (rc)
-                GOTO(err_decref, rc);
+       rc = client_obd_setup(obd, lcfg);
+       if (rc)
+               GOTO(err_decref, rc);

 
        rc = mgc_llog_init(NULL, obd);
 
        rc = mgc_llog_init(NULL, obd);

-        if (rc) {
-                CERROR("failed to setup llogging subsystems\n");
-                GOTO(err_cleanup, rc);
-        }
+       if (rc) {
+               CERROR("failed to setup llogging subsystems\n");
+               GOTO(err_cleanup, rc);
+       }

 
 

-        lprocfs_mgc_init_vars(&lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-        sptlrpc_lprocfs_cliobd_attach(obd);
+       lprocfs_mgc_init_vars(&lvars);
+       lprocfs_obd_setup(obd, lvars.obd_vars);
+       sptlrpc_lprocfs_cliobd_attach(obd);

 
 

-        if (cfs_atomic_inc_return(&mgc_count) == 1) {
+       if (cfs_atomic_inc_return(&mgc_count) == 1) {

                rq_state = 0;
                init_waitqueue_head(&rq_waitq);
 
                rq_state = 0;
                init_waitqueue_head(&rq_waitq);
 


@@ -928,15 +928,15 @@ static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                }
                /* rc is the task_struct pointer of mgc_requeue_thread. */
                rc = 0;
                }
                /* rc is the task_struct pointer of mgc_requeue_thread. */
                rc = 0;

-        }
+       }

 
 

-        RETURN(rc);
+       RETURN(rc);

 
 err_cleanup:
 
 err_cleanup:

-        client_obd_cleanup(obd);
+       client_obd_cleanup(obd);

 err_decref:
 err_decref:

-        ptlrpcd_decref();
-        RETURN(rc);
+       ptlrpcd_decref();
+       RETURN(rc);

 }
 
 /* based on ll_mdc_blocking_ast */
 }
 
 /* based on ll_mdc_blocking_ast */