[PATCH] f2fs: avoid fi->i_gc_rwsem[WRITE] lock in f2fs_gc

From: Jaegeuk Kim
Date: Tue Jul 24 2018 - 23:22:37 EST


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 <jaegeuk@xxxxxxxxxx>
---
fs/f2fs/file.c | 2 ++
fs/f2fs/segment.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 84293423f830..3a5c35fa0603 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -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]);
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index d28fa03a115f..17354089b4ab 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -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);
--
2.17.0.441.gb46fe60e1d-goog