forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: lustre: ptlrpc: return a meaningful status from ptlrpcd_init()

Browse source 
This patch has the following:
1) Fix for the return value from ptlrpcd_init(). It will now return a
   correct status instead of returning zero always.
2) ptlrpcd_addref() should not increment ptlrpcd_users on error.
3) Added code in a mdc_setup() and mgc_setup() to test the return
   value of ptlrpcd_addref() and return on error.

Signed-off-by: Swapnil Pimpale <spimpale@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3808
Reviewed-on: http://review.whamcloud.com/7522
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Swapnil Pimpale 2016-04-12 16:14:09 -04:00 • committed by Greg Kroah-Hartman
parent 489d82fcd8
commit cc3b775896
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/lustre/lustre/mdc/mdc_request.c
View file

@ -2314,12 +2314,14 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
return -ENOMEM;
mdc_init_rpc_lock(cli->cl_rpc_lock);
ptlrpcd_addref();
rc = ptlrpcd_addref();
if (rc < 0)
goto err_rpc_lock;
cli->cl_close_lock = kzalloc(sizeof(*cli->cl_close_lock), GFP_NOFS);
if (!cli->cl_close_lock) {
rc = -ENOMEM;
goto err_rpc_lock;
goto err_ptlrpcd_decref;
}
mdc_init_rpc_lock(cli->cl_close_lock);
@ -2345,9 +2347,10 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
err_close_lock:
kfree(cli->cl_close_lock);
err_ptlrpcd_decref:
ptlrpcd_decref();
err_rpc_lock:
kfree(cli->cl_rpc_lock);
ptlrpcd_decref();
return rc;
}

5
drivers/staging/lustre/lustre/mgc/mgc_request.c
View file

@ -734,7 +734,9 @@ static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
struct task_struct *task;
int rc;
ptlrpcd_addref();
rc = ptlrpcd_addref();
if (rc < 0)
goto err_noref;
rc = client_obd_setup(obd, lcfg);
if (rc)
@ -773,6 +775,7 @@ err_cleanup:
client_obd_cleanup(obd);
err_decref:
ptlrpcd_decref();
err_noref:
return rc;
}

5
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
View file

@ -909,8 +909,11 @@ int ptlrpcd_addref(void)
int rc = 0;
mutex_lock(&ptlrpcd_mutex);
if (++ptlrpcd_users == 1)
if (++ptlrpcd_users == 1) {
rc = ptlrpcd_init();
if (rc < 0)
ptlrpcd_users--;
}
mutex_unlock(&ptlrpcd_mutex);
return rc;
}