diff options
| author | Chao Yu <yuchao0@huawei.com> | 2017-05-03 18:59:13 +0300 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-05-04 00:30:19 +0300 |
| commit | a72d4b97bb83c92a25d3eb21cc36b9bf94077c60 (patch) | |
| tree | ddf25cc4340c7f3a48974669354a4cc7df3b43d8 /fs | |
| parent | 3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905 (diff) | |
| download | linux-a72d4b97bb83c92a25d3eb21cc36b9bf94077c60.tar.xz | |
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: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index cdbf1add2a11..abb0403d3414 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -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; |