mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-18 07:35:12 +08:00
nilfs2: get rid of nilfs_mount_options structure
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:
parent
a7a8447ede
commit
06df0f9992
@ -27,14 +27,6 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
/*
|
||||
* Mount options
|
||||
*/
|
||||
struct nilfs_mount_options {
|
||||
unsigned long mount_opt;
|
||||
__u64 snapshot_cno;
|
||||
};
|
||||
|
||||
struct the_nilfs;
|
||||
struct nilfs_sc_info;
|
||||
|
||||
|
@ -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 the_nilfs *nilfs = sbi->s_nilfs;
|
||||
unsigned long old_sb_flags;
|
||||
struct nilfs_mount_options old_opts;
|
||||
unsigned long old_mount_opt;
|
||||
int err;
|
||||
|
||||
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)) {
|
||||
err = -EINVAL;
|
||||
@ -1092,7 +1092,7 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data)
|
||||
|
||||
restore_opts:
|
||||
sb->s_flags = old_sb_flags;
|
||||
sbi->s_mount_opt = old_opts.mount_opt;
|
||||
sbi->s_mount_opt = old_mount_opt;
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user