Commit b7de231b authored by Eric Sandeen's avatar Eric Sandeen Committed by Jaegeuk Kim
Browse files

f2fs: pass sbi rather than sb to quota qf_name helpers 



With the new mount api we will not have the superblock available during
option parsing. Prepare for this by passing *sbi rather than *sb.

For now, we are parsing after fill_super has been done, so sbi->sb will
exist. Under the new mount API this will require more care, but do the
simple change for now.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 9cca4987

fs/f2fs/super.c

+10 −10
Original line number Diff line number Diff line
@@ -386,10 +386,10 @@ static void init_once(void *foo) 
#ifdef CONFIG_QUOTA

static const char * const quotatypes[] = INITQFNAMES;

#define QTYPE2NAME(t) (quotatypes[t])

static int f2fs_set_qf_name(struct super_block *sb, int qtype,

static int f2fs_set_qf_name(struct f2fs_sb_info *sbi, int qtype,

							substring_t *args)

{

	struct f2fs_sb_info *sbi = F2FS_SB(sb);

	struct super_block *sb = sbi->sb;

	char *qname;

	int ret = -EINVAL;
@@ -427,9 +427,9 @@ static int f2fs_set_qf_name(struct super_block *sb, int qtype, 
	return ret;

}



static int f2fs_clear_qf_name(struct super_block *sb, int qtype)

static int f2fs_clear_qf_name(struct f2fs_sb_info *sbi, int qtype)

{

	struct f2fs_sb_info *sbi = F2FS_SB(sb);

	struct super_block *sb = sbi->sb;



	if (sb_any_quota_loaded(sb) && F2FS_OPTION(sbi).s_qf_names[qtype]) {

		f2fs_err(sbi, "Cannot change journaled quota options when quota turned on");
@@ -934,32 +934,32 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) 
			set_opt(sbi, PRJQUOTA);

			break;

		case Opt_usrjquota:

			ret = f2fs_set_qf_name(sb, USRQUOTA, &args[0]);

			ret = f2fs_set_qf_name(sbi, USRQUOTA, &args[0]);

			if (ret)

				return ret;

			break;

		case Opt_grpjquota:

			ret = f2fs_set_qf_name(sb, GRPQUOTA, &args[0]);

			ret = f2fs_set_qf_name(sbi, GRPQUOTA, &args[0]);

			if (ret)

				return ret;

			break;

		case Opt_prjjquota:

			ret = f2fs_set_qf_name(sb, PRJQUOTA, &args[0]);

			ret = f2fs_set_qf_name(sbi, PRJQUOTA, &args[0]);

			if (ret)

				return ret;

			break;

		case Opt_offusrjquota:

			ret = f2fs_clear_qf_name(sb, USRQUOTA);

			ret = f2fs_clear_qf_name(sbi, USRQUOTA);

			if (ret)

				return ret;

			break;

		case Opt_offgrpjquota:

			ret = f2fs_clear_qf_name(sb, GRPQUOTA);

			ret = f2fs_clear_qf_name(sbi, GRPQUOTA);

			if (ret)

				return ret;

			break;

		case Opt_offprjjquota:

			ret = f2fs_clear_qf_name(sb, PRJQUOTA);

			ret = f2fs_clear_qf_name(sbi, PRJQUOTA);

			if (ret)

				return ret;

			break;