UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Artem Bityutskiy 2012-06-01 17:18:04 +03:00 committed by Al Viro
parent d58367515f
commit efaa33eb13
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/reiserfs/super.c
View File

@ -1730,19 +1730,19 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
return -ENOMEM; return -ENOMEM;
s->s_fs_info = sbi; s->s_fs_info = sbi;
/* Set default values for options: non-aggressive tails, RO on errors */ /* Set default values for options: non-aggressive tails, RO on errors */
REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_SMALLTAIL); sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ERROR_RO); sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH); sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
/* no preallocation minimum, be smart in /* no preallocation minimum, be smart in
reiserfs_file_write instead */ 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 */ /* 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 */ /* setup default block allocator options */
reiserfs_init_alloc_options(s); reiserfs_init_alloc_options(s);
mutex_init(&REISERFS_SB(s)->lock); mutex_init(&sbi->lock);
REISERFS_SB(s)->lock_depth = -1; sbi->lock_depth = -1;
jdev_name = NULL; jdev_name = NULL;
if (reiserfs_parse_options if (reiserfs_parse_options
@ -1751,8 +1751,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
goto error_unlocked; goto error_unlocked;
} }
if (jdev_name && jdev_name[0]) { if (jdev_name && jdev_name[0]) {
REISERFS_SB(s)->s_jdev = kstrdup(jdev_name, GFP_KERNEL); sbi->s_jdev = kstrdup(jdev_name, GFP_KERNEL);
if (!REISERFS_SB(s)->s_jdev) { if (!sbi->s_jdev) {
SWARN(silent, s, "", "Cannot allocate memory for " SWARN(silent, s, "", "Cannot allocate memory for "
"journal device name"); "journal device name");
goto error; goto error;
@ -1810,7 +1810,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
/* make data=ordered the default */ /* make data=ordered the default */
if (!reiserfs_data_log(s) && !reiserfs_data_ordered(s) && if (!reiserfs_data_log(s) && !reiserfs_data_ordered(s) &&
!reiserfs_data_writeback(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)) { if (reiserfs_data_log(s)) {