Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 743d6feb authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman
Browse files

staging: lustre: build: bump build version warnings to x.y.53 



Move the LUSTRE_VERSION_CODE checks to trigger on x.y.53 instead of
x.y.50, so that it is into the development cycle that they are hit
instead of right at the start.

In many cases, the #warning has been removed (to prevent build errors)
and instead the code is just disabled outright.  The dead code can be
seen easily and removed in the future with less interruption to the
development process.

Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarEmoly Liu <emoly.liu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4217
Reviewed-on: http://review.whamcloud.com/8630


Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Tested-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 426245a4

drivers/staging/lustre/lustre/include/lustre_import.h

+2 −0
Original line number Diff line number Diff line
@@ -285,8 +285,10 @@ struct obd_import { 
				  imp_resend_replay:1,

				  /* disable normal recovery, for test only. */

				  imp_no_pinger_recover:1,

#if OBD_OCD_VERSION(3, 0, 53, 0) > LUSTRE_VERSION_CODE

				  /* need IR MNE swab */

				  imp_need_mne_swab:1,

#endif

				  /* import must be reconnected instead of

				   * chosing new connection

				   */

drivers/staging/lustre/lustre/include/obd.h

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ struct client_obd { 
	/* used by quotacheck when the servers are older than 2.4 */

	int		      cl_qchk_stat; /* quotacheck stat of the peer */

#define CL_NOT_QUOTACHECKED 1   /* client->cl_qchk_stat init value */

#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 7, 50, 0)

#if OBD_OCD_VERSION(2, 7, 53, 0) < LUSTRE_VERSION_CODE

#warning "please consider removing quotacheck compatibility code"

#endif

drivers/staging/lustre/lustre/mgc/mgc_request.c

+1 −3
Original line number Diff line number Diff line
@@ -1428,14 +1428,12 @@ static int mgc_process_recover_log(struct obd_device *obd, 
	}



	mne_swab = !!ptlrpc_rep_need_swab(req);

#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 2, 50, 0)

#if OBD_OCD_VERSION(3, 0, 53, 0) > LUSTRE_VERSION_CODE

	/* This import flag means the server did an extra swab of IR MNE

	 * records (fixed in LU-1252), reverse it here if needed. LU-1644

	 */

	if (unlikely(req->rq_import->imp_need_mne_swab))

		mne_swab = !mne_swab;

#else

#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and imp_need_mne_swab"

#endif



	for (i = 0; i < nrpages && ealen > 0; i++) {

drivers/staging/lustre/lustre/obdclass/obd_mount.c

+1 −3
Original line number Diff line number Diff line
@@ -384,10 +384,8 @@ int lustre_start_mgc(struct super_block *sb) 
				  OBD_CONNECT_FULL20 | OBD_CONNECT_IMP_RECOV |

				  OBD_CONNECT_LVB_TYPE;



#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 2, 50, 0)

#if OBD_OCD_VERSION(3, 0, 53, 0) > LUSTRE_VERSION_CODE

	data->ocd_connect_flags |= OBD_CONNECT_MNE_SWAB;

#else

#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and imp_need_mne_swab"

#endif



	if (lmd_is_client(lsi->lsi_lmd) &&

drivers/staging/lustre/lustre/ptlrpc/import.c

+1 −3
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env, 
			warned = true;

		}



#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 2, 50, 0)

#if OBD_OCD_VERSION(3, 0, 53, 0) > LUSTRE_VERSION_CODE

		/* Check if server has LU-1252 fix applied to not always swab

		 * the IR MNE entries. Do this only once per connection.  This

		 * fixup is version-limited, because we don't want to carry the
@@ -1060,8 +1060,6 @@ static int ptlrpc_connect_interpret(const struct lu_env *env, 
			imp->imp_need_mne_swab = 1;

		else /* clear if server was upgraded since last connect */

			imp->imp_need_mne_swab = 0;

#else

#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and imp_need_mne_swab"

#endif



		if (ocd->ocd_connect_flags & OBD_CONNECT_CKSUM) {