f2fs: fix quota_sync failure due to f2fs_lock_op

f2fs_quota_sync() uses f2fs_lock_op() before flushing dirty pages, but
f2fs_write_data_page() returns EAGAIN.
Likewise dentry blocks, we can just bypass getting the lock, since quota
blocks are also maintained by checkpoint.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index df7b2d1..26b071a 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -985,7 +985,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
        loff_t psize;
        int i, err;
 
-       if (!f2fs_trylock_op(sbi))
+       if (!IS_NOQUOTA(inode) && !f2fs_trylock_op(sbi))
                return -EAGAIN;
 
        set_new_dnode(&dn, cc->inode, NULL, NULL, 0);
@@ -1092,7 +1092,8 @@ unlock_continue:
                set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
 
        f2fs_put_dnode(&dn);
-       f2fs_unlock_op(sbi);
+       if (!IS_NOQUOTA(inode))
+               f2fs_unlock_op(sbi);
 
        spin_lock(&fi->i_size_lock);
        if (fi->last_disk_size < psize)
@@ -1118,7 +1119,8 @@ out_put_cic:
 out_put_dnode:
        f2fs_put_dnode(&dn);
 out_unlock_op:
-       f2fs_unlock_op(sbi);
+       if (!IS_NOQUOTA(inode))
+               f2fs_unlock_op(sbi);
        return -EAGAIN;
 }
 

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 199877c..a5505ab 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2659,8 +2659,8 @@ write:
                        f2fs_available_free_memory(sbi, BASE_CHECK))))
                goto redirty_out;
 
-       /* Dentry blocks are controlled by checkpoint */
-       if (S_ISDIR(inode->i_mode)) {
+       /* Dentry/quota blocks are controlled by checkpoint */
+       if (S_ISDIR(inode->i_mode) || IS_NOQUOTA(inode)) {
                fio.need_lock = LOCK_DONE;
                err = f2fs_do_write_data_page(&fio);
                goto done;