f2fs: compress: fix to cover {reserve,release}_compress_blocks() w/ cp_rwsem lock

[ Upstream commit 0a4ed2d97cb6d044196cc3e726b6699222b41019 ]

It needs to cover {reserve,release}_compress_blocks() w/ cp_rwsem lock
to avoid racing with checkpoint, otherwise, filesystem metadata including
blkaddr in dnode, inode fields and .total_valid_block_count may be
corrupted after SPO case.

Fixes: ef8d563f184e ("f2fs: introduce F2FS_IOC_RELEASE_COMPRESS_BLOCKS")
Fixes: c75488fb4d82 ("f2fs: introduce F2FS_IOC_RESERVE_COMPRESS_BLOCKS")
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index f10156aecf425e365095168e155b81b2e30830fa..30b015fbec6a5a33452260a345f395a943380bf0 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3490,9 +3490,12 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
                struct dnode_of_data dn;
                pgoff_t end_offset, count;
 
+               f2fs_lock_op(sbi);
+
                set_new_dnode(&dn, inode, NULL, NULL, 0);
                ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE);
                if (ret) {
+                       f2fs_unlock_op(sbi);
                        if (ret == -ENOENT) {
                                page_idx = f2fs_get_next_page_offset(&dn,
                                                                page_idx);
@@ -3510,6 +3513,8 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
 
                f2fs_put_dnode(&dn);
 
+               f2fs_unlock_op(sbi);
+
                if (ret < 0)
                        break;
 
@@ -3652,9 +3657,12 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
                struct dnode_of_data dn;
                pgoff_t end_offset, count;
 
+               f2fs_lock_op(sbi);
+
                set_new_dnode(&dn, inode, NULL, NULL, 0);
                ret = f2fs_get_dnode_of_data(&dn, page_idx, LOOKUP_NODE);
                if (ret) {
+                       f2fs_unlock_op(sbi);
                        if (ret == -ENOENT) {
                                page_idx = f2fs_get_next_page_offset(&dn,
                                                                page_idx);
@@ -3672,6 +3680,8 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg)
 
                f2fs_put_dnode(&dn);
 
+               f2fs_unlock_op(sbi);
+
                if (ret < 0)
                        break;