Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nilfs2: get rid of nilfs_mount_options structure

Browse source 
Only mount_opt member is used in the nilfs_mount_options structure,
and we can simplify it.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi 2010-12-27 00:04:06 +09:00
parent a7a8447ede
commit 06df0f9992
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/nilfs2/sb.h
View file

@ -27,14 +27,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/fs.h> #include <linux/fs.h>
/*
* Mount options
*/
struct nilfs_mount_options {
unsigned long mount_opt;
__u64 snapshot_cno;
};
struct the_nilfs; struct the_nilfs;
struct nilfs_sc_info; struct nilfs_sc_info;

6
fs/nilfs2/super.c
View file

@ -1019,11 +1019,11 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data)
struct nilfs_sb_info *sbi = NILFS_SB(sb); struct nilfs_sb_info *sbi = NILFS_SB(sb);
struct the_nilfs *nilfs = sbi->s_nilfs; struct the_nilfs *nilfs = sbi->s_nilfs;
unsigned long old_sb_flags; unsigned long old_sb_flags;
struct nilfs_mount_options old_opts; unsigned long old_mount_opt;
int err; int err;
old_sb_flags = sb->s_flags; old_sb_flags = sb->s_flags;
old_opts.mount_opt = sbi->s_mount_opt; old_mount_opt = sbi->s_mount_opt;
if (!parse_options(data, sb, 1)) { if (!parse_options(data, sb, 1)) {
err = -EINVAL; err = -EINVAL;
@ -1092,7 +1092,7 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data)
restore_opts: restore_opts:
sb->s_flags = old_sb_flags; sb->s_flags = old_sb_flags;
sbi->s_mount_opt = old_opts.mount_opt; sbi->s_mount_opt = old_mount_opt;
return err; return err;
} }