Commit aa2d3e81 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: remove IS_MDS|IS_OST|IS_MGS defines and users 



These could only happen on the server, so they make no sense
on the client.

Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15b441cd

drivers/staging/lustre/lustre/include/lustre_disk.h

+0 −3
Original line number Diff line number Diff line
@@ -177,9 +177,6 @@ struct lustre_disk_data { 
};





#define IS_MDT(data)    ((data)->lsi_flags & LDD_F_SV_TYPE_MDT)

#define IS_OST(data)    ((data)->lsi_flags & LDD_F_SV_TYPE_OST)

#define IS_MGS(data)    ((data)->lsi_flags & LDD_F_SV_TYPE_MGS)

#define MT_STR(data)    mt_str((data)->ldd_mount_type)



/* Make the mdt/ost server obd name based on the filesystem name */

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

+0 −8
Original line number Diff line number Diff line
@@ -248,17 +248,9 @@ static struct config_llog_data *config_recover_log_add(struct obd_device *obd, 
	struct super_block *sb)

{

	struct config_llog_instance lcfg = *cfg;

	struct lustre_sb_info *lsi = s2lsi(sb);

	struct config_llog_data *cld;

	char logname[32];



	if (IS_OST(lsi))

		return NULL;



	/* for osp-on-ost, see lustre_start_osp() */

	if (IS_MDT(lsi) && lcfg.cfg_instance)

		return NULL;



	/* we have to use different llog for clients and mdts for cmd

	 * where only clients are notified if one of cmd server restarts */

	LASSERT(strlen(fsname) < sizeof(logname) / 2);

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

+0 −6
Original line number Diff line number Diff line
@@ -281,12 +281,6 @@ int lustre_start_mgc(struct super_block *sb) 
		}



		recov_bk = 0;

		/* If we are restarting the MGS, don't try to keep the MGC's

		   old connection, or registration will fail. */

		if (IS_MGS(lsi)) {

			CDEBUG(D_MOUNT, "New MGS with live MGC\n");

			recov_bk = 1;

		}



		/* Try all connections, but only once (again).

		   We don't want to block another target from starting