diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-06-01 10:18:04 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 10:37:36 -0400 |
commit | efaa33eb1309d65528d5a54d87d69bdcbdae8c10 (patch) | |
tree | 31da93df726e53fa56447226605d4870b37f7754 /fs/reiserfs | |
parent | d58367515f47371f7202d8b258ee0614a8955a6a (diff) |
reiserfs: cleanup reiserfs_fill_super a bit
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>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r-- | 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 c07b7d709447..60cddb7e6389 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) | |||
1730 | return -ENOMEM; | 1730 | return -ENOMEM; |
1731 | s->s_fs_info = sbi; | 1731 | s->s_fs_info = sbi; |
1732 | /* Set default values for options: non-aggressive tails, RO on errors */ | 1732 | /* Set default values for options: non-aggressive tails, RO on errors */ |
1733 | REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_SMALLTAIL); | 1733 | sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL); |
1734 | REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ERROR_RO); | 1734 | sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO); |
1735 | REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH); | 1735 | sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH); |
1736 | /* no preallocation minimum, be smart in | 1736 | /* no preallocation minimum, be smart in |
1737 | reiserfs_file_write instead */ | 1737 | reiserfs_file_write instead */ |
1738 | REISERFS_SB(s)->s_alloc_options.preallocmin = 0; | 1738 | sbi->s_alloc_options.preallocmin = 0; |
1739 | /* Preallocate by 16 blocks (17-1) at once */ | 1739 | /* Preallocate by 16 blocks (17-1) at once */ |
1740 | REISERFS_SB(s)->s_alloc_options.preallocsize = 17; | 1740 | sbi->s_alloc_options.preallocsize = 17; |
1741 | /* setup default block allocator options */ | 1741 | /* setup default block allocator options */ |
1742 | reiserfs_init_alloc_options(s); | 1742 | reiserfs_init_alloc_options(s); |
1743 | 1743 | ||
1744 | mutex_init(&REISERFS_SB(s)->lock); | 1744 | mutex_init(&sbi->lock); |
1745 | REISERFS_SB(s)->lock_depth = -1; | 1745 | sbi->lock_depth = -1; |
1746 | 1746 | ||
1747 | jdev_name = NULL; | 1747 | jdev_name = NULL; |
1748 | if (reiserfs_parse_options | 1748 | if (reiserfs_parse_options |
@@ -1751,8 +1751,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) | |||
1751 | goto error_unlocked; | 1751 | goto error_unlocked; |
1752 | } | 1752 | } |
1753 | if (jdev_name && jdev_name[0]) { | 1753 | if (jdev_name && jdev_name[0]) { |
1754 | REISERFS_SB(s)->s_jdev = kstrdup(jdev_name, GFP_KERNEL); | 1754 | sbi->s_jdev = kstrdup(jdev_name, GFP_KERNEL); |
1755 | if (!REISERFS_SB(s)->s_jdev) { | 1755 | if (!sbi->s_jdev) { |
1756 | SWARN(silent, s, "", "Cannot allocate memory for " | 1756 | SWARN(silent, s, "", "Cannot allocate memory for " |
1757 | "journal device name"); | 1757 | "journal device name"); |
1758 | goto error; | 1758 | goto error; |
@@ -1810,7 +1810,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) | |||
1810 | /* make data=ordered the default */ | 1810 | /* make data=ordered the default */ |
1811 | if (!reiserfs_data_log(s) && !reiserfs_data_ordered(s) && | 1811 | if (!reiserfs_data_log(s) && !reiserfs_data_ordered(s) && |
1812 | !reiserfs_data_writeback(s)) { | 1812 | !reiserfs_data_writeback(s)) { |
1813 | REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_DATA_ORDERED); | 1813 | sbi->s_mount_opt |= (1 << REISERFS_DATA_ORDERED); |
1814 | } | 1814 | } |
1815 | 1815 | ||
1816 | if (reiserfs_data_log(s)) { | 1816 | if (reiserfs_data_log(s)) { |