diff options
| author |   Andreas Ruprecht <rupran@einserver.de> | 2014-11-23 14:37:54 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 12:50:27 -0800 |
| commit | b0e47b96e313aa6c855843b506626b3fbeb3bcc7 (patch) | |
| tree | 5b0a1217947ca29564c21921ce7d528dd7fe6e81 /drivers/staging/lustre | |
| parent | staging: lustre: ldlm: Fix warning about unneeded return statement (diff) | |
| download | linux-dev-b0e47b96e313aa6c855843b506626b3fbeb3bcc7.tar.xz linux-dev-b0e47b96e313aa6c855843b506626b3fbeb3bcc7.zip | |
staging: lustre: ldlm: Remove unnecessary line continuations
checkpatch finds two unnecessary line continuations in ldlm_lockd.c
which are removed by this patch.
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index b95f73cb5548..98fbd3f7e751 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -1051,7 +1051,7 @@ static int ldlm_setup(void) .so_req_handler = ldlm_callback_handler, }, }; - ldlm_state->ldlm_cb_service = \ + ldlm_state->ldlm_cb_service = ptlrpc_register_service(&conf, ldlm_svc_proc_dir); if (IS_ERR(ldlm_state->ldlm_cb_service)) { CERROR("failed to start service\n"); @@ -1079,7 +1079,7 @@ static int ldlm_setup(void) blp->blp_min_threads = LDLM_NTHRS_INIT; blp->blp_max_threads = LDLM_NTHRS_MAX; } else { - blp->blp_min_threads = blp->blp_max_threads = \ + blp->blp_min_threads = blp->blp_max_threads = min_t(int, LDLM_NTHRS_MAX, max_t(int, LDLM_NTHRS_INIT, ldlm_num_threads)); } |