Commit 95c9c008 authored by Nathaniel Clark's avatar Nathaniel Clark Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ldlm: Fix Multiple Assignments 



Fix all multiple assignments on lustre/ldlm directory.

Signed-off-by: default avatarNathaniel Clark <nathaniel.l.clark@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a30dd801

drivers/staging/lustre/lustre/ldlm/ldlm_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+5 −3
Original line number Diff line number Diff line
@@ -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++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE