Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbd12f9 authored May 29, 2019 by Jaegeuk Kim

Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.19.y' into android-4.19



* origin/upstream-f2fs-stable-linux-4.19.y:
  f2fs: link f2fs quota ops for sysfile

Change-Id: Ie1262544e2bc3d4d08e957d4f5e2b2dd98c20190
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

parents 226f016a 1edcba14

fs/f2fs/checkpoint.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1328,10 +1328,8 @@ static void update_ckpt_flags(struct f2fs_sb_info sbi, struct cp_control cpc)

		if (is_sbi_flag_set(sbi, SBI_QUOTA_SKIP_FLUSH))
		__set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);
		/*
		* TODO: we count on fsck.f2fs to clear this flag until we figure out
		* missing cases which clear it incorrectly.
		*/
		else
		__clear_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);

		if (is_sbi_flag_set(sbi, SBI_QUOTA_NEED_REPAIR))
		__set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);

fs/f2fs/super.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -3165,9 +3165,6 @@ static int f2fs_fill_super(struct super_block sb, void data, int silent)

		#ifdef CONFIG_QUOTA
		sb->dq_op = &f2fs_quota_operations;
		if (f2fs_sb_has_quota_ino(sbi))
		sb->s_qcop = &dquot_quotactl_sysfile_ops;
		else
		sb->s_qcop = &f2fs_quotactl_ops;
		sb->s_quota_types = QTYPE_MASK_USR \| QTYPE_MASK_GRP \| QTYPE_MASK_PRJ;