f2fs: avoid fi->i_gc_rwsem[WRITE] lock in f2fs_gc
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: avoid fi->i_gc_rwsem[WRITE] lock in f2fs_gc
The f2fs_gc() called by f2fs_balance_fs() requires to be called outside of fi->i_gc_rwsem[WRITE], since f2fs_gc() can try to grab it in a loop.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/file.c | 2 ++ fs/f2fs/segment.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/file.c +2 -0
@@ -1754,6 +1754,8 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)if (ret)return ret; +f2fs_balance_fs (F2FS_I_SB (inode), true); +inode_lock (inode);down_write (&F2FS_I (inode)->i_gc_rwsem[WRITE ]);
fs/f2fs/segment.c +0 -1
@@ -445,7 +445,6 @@ int f2fs_commit_inmem_pages(struct inode *inode)struct f2fs_inode_info *fi =F2FS_I (inode);int err; -f2fs_balance_fs (sbi, true);f2fs_lock_op (sbi);set_inode_flag (inode,FI_ATOMIC_COMMIT );
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
Chao Yu
maintainerQuoted 2 lines · Jaegeuk Kim
The
f2fs_gc()called byf2fs_balance_fs()requires to be called outside of fi->i_gc_rwsem[WRITE], sincef2fs_gc()can try to grab it in a loop.
It seems there are other paths having the same issue, how about fixing all of them in this patch?
Thanks,
Quoted 33 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/file.c | 2 ++ fs/f2fs/segment.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)fs/f2fs/file.c +2
-0@@ -1754,6 +1754,8 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)if (ret)return ret; +f2fs_balance_fs (F2FS_I_SB (inode), true); +inode_lock (inode);down_write (&F2FS_I (inode)->i_gc_rwsem[WRITE ]);fs/f2fs/segment.c +0
-1@@ -445,7 +445,6 @@ int f2fs_commit_inmem_pages(struct inode *inode)struct f2fs_inode_info *fi =F2FS_I (inode);int err; -f2fs_balance_fs (sbi, true);f2fs_lock_op (sbi);set_inode_flag (inode,FI_ATOMIC_COMMIT );