lkml.org 
[lkml]   [2011]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/3] ext4: Deprecate barrier= and nobarrier mount options
    As part of migrating the FLUSH/FUA knob to the block layer, remove the support
    code for the barrier-related mount options and remove the conditionals around
    flushes in favor of always issuing the flush. The block layer will handle
    gracefully the situation where a FLUSH or FUA request is issued to a device
    that doesn't support it. Modify the option parsing code to print a warning if
    someone tries to use the old mount option.

    Note: The nobarrier bit in the default mount flags is now useless.

    Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
    ---

    fs/ext4/ext4.h | 1 -
    fs/ext4/super.c | 23 ++---------------------
    2 files changed, 2 insertions(+), 22 deletions(-)

    diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
    index 0c8d97b..fa4c688 100644
    --- a/fs/ext4/ext4.h
    +++ b/fs/ext4/ext4.h
    @@ -893,7 +893,6 @@ struct ext4_inode_info {
    #define EXT4_MOUNT_XATTR_USER 0x04000 /* Extended user attributes */
    #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
    #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
    -#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
    #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
    #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
    #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
    diff --git a/fs/ext4/super.c b/fs/ext4/super.c
    index 7379829..cd8e7b8 100644
    --- a/fs/ext4/super.c
    +++ b/fs/ext4/super.c
    @@ -1022,13 +1022,6 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
    (unsigned) sbi->s_min_batch_time);
    }

    - /*
    - * We're changing the default of barrier mount option, so
    - * let's always display its mount state so it's clear what its
    - * status is.
    - */
    - seq_puts(seq, ",barrier=");
    - seq_puts(seq, test_opt(sb, BARRIER) ? "1" : "0");
    if (test_opt(sb, JOURNAL_ASYNC_COMMIT))
    seq_puts(seq, ",journal_async_commit");
    else if (test_opt(sb, JOURNAL_CHECKSUM))
    @@ -1701,18 +1694,9 @@ set_qf_format:
    sbi->s_mount_flags |= EXT4_MF_FS_ABORTED;
    break;
    case Opt_nobarrier:
    - clear_opt(sb, BARRIER);
    - break;
    case Opt_barrier:
    - if (args[0].from) {
    - if (match_int(&args[0], &option))
    - return 0;
    - } else
    - option = 1; /* No argument, default to 1 */
    - if (option)
    - set_opt(sb, BARRIER);
    - else
    - clear_opt(sb, BARRIER);
    + ext4_msg(sb, KERN_INFO, "barrier options are "
    + "deprecated. Use ignore_flush in sysfs.");
    break;
    case Opt_ignore:
    break;
    @@ -3125,9 +3109,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
    sbi->s_min_batch_time = EXT4_DEF_MIN_BATCH_TIME;
    sbi->s_max_batch_time = EXT4_DEF_MAX_BATCH_TIME;

    - if ((def_mount_opts & EXT4_DEFM_NOBARRIER) == 0)
    - set_opt(sb, BARRIER);
    -
    /*
    * enable delayed allocation by default
    * Use -o nodelalloc to turn it off

    \
     
     \ /
      Last update: 2011-01-26 08:27    [W:0.025 / U:29.944 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site