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

Commit a72d4b97 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: relocate inode_{,un}lock in F2FS_IOC_SETFLAGS 



This patch expands cover region of inode->i_rwsem to keep setting flag
atomically.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 3adc5fcb

fs/f2fs/file.c

+4 −3
Original line number Diff line number Diff line
@@ -1473,10 +1473,10 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg) 
	if (ret)

		return ret;



	flags = f2fs_mask_flags(inode->i_mode, flags);



	inode_lock(inode);



	flags = f2fs_mask_flags(inode->i_mode, flags);



	oldflags = fi->i_flags;



	if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
@@ -1490,10 +1490,11 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg) 
	flags = flags & FS_FL_USER_MODIFIABLE;

	flags |= oldflags & ~FS_FL_USER_MODIFIABLE;

	fi->i_flags = flags;

	inode_unlock(inode);



	inode->i_ctime = current_time(inode);

	f2fs_set_inode_flags(inode);



	inode_unlock(inode);

out:

	mnt_drop_write_file(filp);

	return ret;