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

Commit 9149a5eb authored Oct 07, 2018 by Chao Yu Committed by Jaegeuk Kim Oct 22, 2018

f2fs: spread f2fs_set_inode_flags()



This patch changes codes as below:
- use f2fs_set_inode_flags() to update i_flags atomically to avoid
potential race.
- synchronize F2FS_I(inode)->i_flags to inode->i_flags in
f2fs_new_inode().
- use f2fs_set_inode_flags() to simply codes in f2fs_quota_{on,off}.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

parent 2baf0781

fs/f2fs/f2fs.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3422,7 +3422,7 @@ static inline void f2fs_set_encrypted_inode(struct inode *inode)
	{		{
	#ifdef CONFIG_F2FS_FS_ENCRYPTION		#ifdef CONFIG_F2FS_FS_ENCRYPTION
	file_set_encrypt(inode);		file_set_encrypt(inode);
	inode->i_flags \|= S_ENCRYPTED;		f2fs_set_inode_flags(inode);
	#endif		#endif
	}		}

fs/f2fs/namei.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -122,6 +122,8 @@ static struct inode f2fs_new_inode(struct inode dir, umode_t mode)
	if (F2FS_I(inode)->i_flags & F2FS_PROJINHERIT_FL)		if (F2FS_I(inode)->i_flags & F2FS_PROJINHERIT_FL)
	set_inode_flag(inode, FI_PROJ_INHERIT);		set_inode_flag(inode, FI_PROJ_INHERIT);

			f2fs_set_inode_flags(inode);

	trace_f2fs_new_inode(inode, 0);		trace_f2fs_new_inode(inode, 0);
	return inode;		return inode;

fs/f2fs/super.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1939,8 +1939,7 @@ static int f2fs_quota_on(struct super_block *sb, int type, int format_id,

	inode_lock(inode);		inode_lock(inode);
	F2FS_I(inode)->i_flags \|= F2FS_NOATIME_FL \| F2FS_IMMUTABLE_FL;		F2FS_I(inode)->i_flags \|= F2FS_NOATIME_FL \| F2FS_IMMUTABLE_FL;
	inode_set_flags(inode, S_NOATIME \| S_IMMUTABLE,		f2fs_set_inode_flags(inode);
	S_NOATIME \| S_IMMUTABLE);
	inode_unlock(inode);		inode_unlock(inode);
	f2fs_mark_inode_dirty_sync(inode, false);		f2fs_mark_inode_dirty_sync(inode, false);

	@@ -1965,7 +1964,7 @@ static int f2fs_quota_off(struct super_block *sb, int type)

	inode_lock(inode);		inode_lock(inode);
	F2FS_I(inode)->i_flags &= ~(F2FS_NOATIME_FL \| F2FS_IMMUTABLE_FL);		F2FS_I(inode)->i_flags &= ~(F2FS_NOATIME_FL \| F2FS_IMMUTABLE_FL);
	inode_set_flags(inode, 0, S_NOATIME \| S_IMMUTABLE);		f2fs_set_inode_flags(inode);
	inode_unlock(inode);		inode_unlock(inode);
	f2fs_mark_inode_dirty_sync(inode, false);		f2fs_mark_inode_dirty_sync(inode, false);
	out_put:		out_put: