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

Commit e39cb21b authored by Ben Evans's avatar Ben Evans Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lustre: Remove old commented out code 



These #if 0 blocks have been in place for years. Assume
they are not used and remove them

Signed-off-by: default avatarBen Evans <bevans@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8058
Reviewed-on: http://review.whamcloud.com/20416


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarFrank Zago <fzago@cray.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-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 24eac929

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -483,8 +483,6 @@ enum obd_notify_event { 
	OBD_NOTIFY_ACTIVE,

	OBD_NOTIFY_ACTIVE,

	/* Device deactivated */

	/* Device deactivated */

	OBD_NOTIFY_INACTIVE,

	OBD_NOTIFY_INACTIVE,

	/* Device disconnected */

	OBD_NOTIFY_DISCON,

	/* Connect data for import were changed */

	/* Connect data for import were changed */

	OBD_NOTIFY_OCD,

	OBD_NOTIFY_OCD,

	/* Sync request */

	/* Sync request */

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -173,14 +173,7 @@ static int lmv_notify(struct obd_device *obd, struct obd_device *watched, 
		 */

		 */

		obd->obd_self_export->exp_connect_data = *conn_data;

		obd->obd_self_export->exp_connect_data = *conn_data;

	}

	}

#if 0



	else if (ev == OBD_NOTIFY_DISCON) {

		/*

		 * For disconnect event, flush fld cache for failout MDS case.

		 */

		fld_client_flush(&lmv->lmv_fld);

	}

#endif

	/*

	/*

	 * Pass the notification up the chain.

	 * Pass the notification up the chain.

	 */

	 */

drivers/staging/lustre/lustre/mdc/mdc_request.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -2465,13 +2465,6 @@ static int mdc_import_event(struct obd_device *obd, struct obd_import *imp, 
	LASSERT(imp->imp_obd == obd);

	LASSERT(imp->imp_obd == obd);





	switch (event) {

	switch (event) {

	case IMP_EVENT_DISCON: {

#if 0

		/* XXX Pass event up to OBDs stack. used only for FLD now */

		rc = obd_notify_observer(obd, obd, OBD_NOTIFY_DISCON, NULL);

#endif

		break;

	}

	case IMP_EVENT_INACTIVE: {

	case IMP_EVENT_INACTIVE: {

		struct client_obd *cli = &obd->u.cli;

		struct client_obd *cli = &obd->u.cli;

		/*

		/*
@@ -2503,6 +2496,7 @@ static int mdc_import_event(struct obd_device *obd, struct obd_import *imp, 
	case IMP_EVENT_OCD:

	case IMP_EVENT_OCD:

		rc = obd_notify_observer(obd, obd, OBD_NOTIFY_OCD, NULL);

		rc = obd_notify_observer(obd, obd, OBD_NOTIFY_OCD, NULL);

		break;

		break;

	case IMP_EVENT_DISCON:

	case IMP_EVENT_DEACTIVATE:

	case IMP_EVENT_DEACTIVATE:

	case IMP_EVENT_ACTIVATE:

	case IMP_EVENT_ACTIVATE:

		break;

		break;