diff options
| author | Chao Yu <yuchao0@huawei.com> | 2020-03-20 11:17:54 +0100 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-03-31 05:46:23 +0200 |
| commit | 9995e40126a73f8249f078bd77f3ad201ec680ae (patch) | |
| tree | 91019feaa6e8f8f800e0058610f885cdefb8cdc5 /fs/f2fs | |
| parent | f2fs: fix potential deadlock on compressed quota file (diff) | |
| download | linux-9995e40126a73f8249f078bd77f3ad201ec680ae.tar.xz linux-9995e40126a73f8249f078bd77f3ad201ec680ae.zip | |
f2fs: don't change inode status under page lock
In order to shrink page lock coverage.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/dir.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 27d0dd7a16d6..0971ccc4664a 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -850,12 +850,6 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 0); set_page_dirty(page); - dir->i_ctime = dir->i_mtime = current_time(dir); - f2fs_mark_inode_dirty_sync(dir, false); - - if (inode) - f2fs_drop_nlink(dir, inode); - if (bit_pos == NR_DENTRY_IN_BLOCK && !f2fs_truncate_hole(dir, page->index, page->index + 1)) { f2fs_clear_page_cache_dirty_tag(page); @@ -867,6 +861,12 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, f2fs_remove_dirty_inode(dir); } f2fs_put_page(page, 1); + + dir->i_ctime = dir->i_mtime = current_time(dir); + f2fs_mark_inode_dirty_sync(dir, false); + + if (inode) + f2fs_drop_nlink(dir, inode); } bool f2fs_empty_dir(struct inode *dir) |