lkml.org 
[lkml]   [2015]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 18/19] staging/lustre: remove IS_MDS|IS_OST|IS_MGS defines and users
    Date
    From: Oleg Drokin <green@linuxhacker.ru>

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

    Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
    ---
    drivers/staging/lustre/lustre/include/lustre_disk.h | 3 ---
    drivers/staging/lustre/lustre/mgc/mgc_request.c | 8 --------
    drivers/staging/lustre/lustre/obdclass/obd_mount.c | 6 ------
    3 files changed, 17 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/include/lustre_disk.h b/drivers/staging/lustre/lustre/include/lustre_disk.h
    index 3f404a2..859007c 100644
    --- 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 8b94dd4..f254bb1 100644
    --- 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 1db4669..16009a6 100644
    --- 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
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-09-16 18:41    [W:3.063 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site