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: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_disk.h b/drivers/staging/lustre/lustre/include/lustre_disk.h
index 3f404a2edc76ed6060ff18dd0bf327d97dbae583..859007c69b56813116bf7bea9b7cc8182ace8c97 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_disk.h
+++ b/drivers/staging/lustre/lustre/include/lustre_disk.h
@@ -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 */

diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index f57d435e3a6b599159542fd86292458ccc9c9e08..9e36642b6ad2e4bbc532582541a3deccb05b2399 100644 (file)
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -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);

diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
index 1db4669262b0d492aa380d8715f4aee70047b79c..16009a6867c9758d5ca98d716f3595676fdaccf4 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
@@ -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