From 86502d6de80ccabf1e786d77645c6af6d57f2ef9 Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Fri, 7 Jun 2013 14:16:53 +0800 Subject: [PATCH] --- yaml --- r: 377693 b: refs/heads/master c: 5fb08372a689360b7db51b0cfb9a068fddf279a2 h: refs/heads/master i: 377691: e014a215cffcb8a79a3775782612c14b45d0b19d v: v3 --- [refs] | 2 +- trunk/fs/f2fs/super.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f8f79c79daff..95b94331a24e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ae8f1627f39bae505b90cade50cd8a911b8bda6 +refs/heads/master: 5fb08372a689360b7db51b0cfb9a068fddf279a2 diff --git a/trunk/fs/f2fs/super.c b/trunk/fs/f2fs/super.c index 3ac305da7cee..4fdcdff45e6a 100644 --- a/trunk/fs/f2fs/super.c +++ b/trunk/fs/f2fs/super.c @@ -303,9 +303,9 @@ static const struct export_operations f2fs_export_ops = { .get_parent = f2fs_get_parent, }; -static int parse_options(struct super_block *sb, struct f2fs_sb_info *sbi, - char *options) +static int parse_options(struct super_block *sb, char *options) { + struct f2fs_sb_info *sbi = F2FS_SB(sb); substring_t args[MAX_OPT_ARGS]; char *p; int arg = 0; @@ -541,6 +541,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) if (err) goto free_sb_buf; } + sb->s_fs_info = sbi; /* init some FS parameters */ sbi->active_logs = NR_CURSEG_TYPE; @@ -553,7 +554,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) set_opt(sbi, POSIX_ACL); #endif /* parse mount options */ - err = parse_options(sb, sbi, (char *)data); + err = parse_options(sb, (char *)data); if (err) goto free_sb_buf; @@ -565,7 +566,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) sb->s_xattr = f2fs_xattr_handlers; sb->s_export_op = &f2fs_export_ops; sb->s_magic = F2FS_SUPER_MAGIC; - sb->s_fs_info = sbi; sb->s_time_gran = 1; sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sbi, POSIX_ACL) ? MS_POSIXACL : 0);