lkml.org 
[lkml]   [2012]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/5] reiserfs: cleanup reiserfs_fill_super a bit
    Date
    From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

    We have the reiserfs superblock pointer in the 'sbi' variable in this
    function, no need to use the 'REISERFS_SB(s)' macro which is the same.
    This is jut a small clean-up.

    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    ---
    fs/reiserfs/super.c | 20 ++++++++++----------
    1 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
    index 8b7616e..92db34b 100644
    --- a/fs/reiserfs/super.c
    +++ b/fs/reiserfs/super.c
    @@ -1730,19 +1730,19 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
    return -ENOMEM;
    s->s_fs_info = sbi;
    /* Set default values for options: non-aggressive tails, RO on errors */
    - REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
    - REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ERROR_RO);
    - REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
    + sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
    + sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
    + sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
    /* no preallocation minimum, be smart in
    reiserfs_file_write instead */
    - REISERFS_SB(s)->s_alloc_options.preallocmin = 0;
    + sbi->s_alloc_options.preallocmin = 0;
    /* Preallocate by 16 blocks (17-1) at once */
    - REISERFS_SB(s)->s_alloc_options.preallocsize = 17;
    + sbi->s_alloc_options.preallocsize = 17;
    /* setup default block allocator options */
    reiserfs_init_alloc_options(s);

    - mutex_init(&REISERFS_SB(s)->lock);
    - REISERFS_SB(s)->lock_depth = -1;
    + mutex_init(&sbi->lock);
    + sbi->lock_depth = -1;

    jdev_name = NULL;
    if (reiserfs_parse_options
    @@ -1751,8 +1751,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
    goto error_unlocked;
    }
    if (jdev_name && jdev_name[0]) {
    - REISERFS_SB(s)->s_jdev = kstrdup(jdev_name, GFP_KERNEL);
    - if (!REISERFS_SB(s)->s_jdev) {
    + sbi->s_jdev = kstrdup(jdev_name, GFP_KERNEL);
    + if (!sbi->s_jdev) {
    SWARN(silent, s, "", "Cannot allocate memory for "
    "journal device name");
    goto error;
    @@ -1810,7 +1810,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
    /* make data=ordered the default */
    if (!reiserfs_data_log(s) && !reiserfs_data_ordered(s) &&
    !reiserfs_data_writeback(s)) {
    - REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_DATA_ORDERED);
    + sbi->s_mount_opt |= (1 << REISERFS_DATA_ORDERED);
    }

    if (reiserfs_data_log(s)) {
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-06-01 16:41    [W:0.044 / U:2.936 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site