diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/mgc/mgc_request.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/mgc/mgc_request.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index bc263adf09d4..60d2b0f12693 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -510,8 +510,6 @@ static void do_requeue(struct config_llog_data *cld) static int mgc_requeue_thread(void *data) { - int rc = 0; - CDEBUG(D_MGC, "Starting requeue thread\n"); /* Keep trying failed locks periodically */ @@ -592,7 +590,7 @@ static int mgc_requeue_thread(void *data) complete(&rq_exit); CDEBUG(D_MGC, "Ending requeue thread\n"); - return rc; + return 0; } /* Add a cld to the list to requeue. Start the requeue thread if needed. @@ -736,8 +734,7 @@ static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg) rc = PTR_ERR(kthread_run(mgc_requeue_thread, NULL, "ll_cfg_requeue")); if (IS_ERR_VALUE(rc)) { - CERROR("%s: Cannot start requeue thread (%d)," - "no more log updates!\n", + CERROR("%s: Cannot start requeue thread (%d),no more log updates!\n", obd->obd_name, rc); goto err_cleanup; } @@ -1021,8 +1018,7 @@ int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp, sptlrpc_flavor2name(&cli->cl_flvr_mgc, str, sizeof(str)); - LCONSOLE_ERROR("asking sptlrpc flavor %s to MGS but " - "currently %s is in use\n", + LCONSOLE_ERROR("asking sptlrpc flavor %s to MGS but currently %s is in use\n", (char *) val, str); rc = -EPERM; } @@ -1055,8 +1051,6 @@ static int mgc_import_event(struct obd_device *obd, struct obd_import *imp, enum obd_import_event event) { - int rc = 0; - LASSERT(imp->imp_obd == obd); CDEBUG(D_MGC, "import event %#x\n", event); @@ -1090,7 +1084,7 @@ static int mgc_import_event(struct obd_device *obd, CERROR("Unknown import event %#x\n", event); LBUG(); } - return rc; + return 0; } enum { |