leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/lustre/ldlm: Fix Multiple Assignments

Browse Source 
Fix all multiple assignments on lustre/ldlm directory.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nathaniel Clark 2016-06-09 22:35:13 -04:00 committed by Greg Kroah-Hartman
parent a30dd801fa
commit 95c9c00886
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
View File

@ -345,7 +345,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
* Set cl_chksum* to CRC32 for now to avoid returning screwed info
* through procfs.
*/
cli->cl_cksum_type = cli->cl_supp_cksum_types = OBD_CKSUM_CRC32;
cli->cl_cksum_type = OBD_CKSUM_CRC32;
cli->cl_supp_cksum_types = OBD_CKSUM_CRC32;
atomic_set(&cli->cl_resends, OSC_DEFAULT_RESENDS);
/* This value may be reduced at connect time in

6
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
View File

@ -1011,9 +1011,11 @@ 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 =
min_t(int, LDLM_NTHRS_MAX, max_t(int, LDLM_NTHRS_INIT,
blp->blp_min_threads = min_t(int, LDLM_NTHRS_MAX,
max_t(int, LDLM_NTHRS_INIT,
ldlm_num_threads));
blp->blp_max_threads = blp->blp_min_threads;
}
for (i = 0; i < blp->blp_min_threads; i++) {