fsck.f2fs: check extent of inline data/dentry inode

Check extent for inline data/dentry inode. If an inode contains inline
data/dentry, it should have no extent.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=200175
Reported-by: Wen Xu <wen.xu@gatech.edu>
Signed-off-by: Sheng Yong <shengyong1@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fsck/fsck.c b/fsck/fsck.c
index b8f692b..1c1a5bb 100644 (file)
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -584,6 +584,9 @@ static void check_extent_info(struct child_info *child,
        if (child->state & FSCK_UNMATCHED_EXTENT)
                return;
 
+       if ((child->state & FSCK_INLINE_INODE) && ei->len)
+               goto unmatched;
+
        if (last) {
                /* hole exist in the back of extent */
                if (child->last_blk != ei->blk + ei->len - 1)
@@ -719,6 +722,10 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
                        ftype == F2FS_FT_FIFO || ftype == F2FS_FT_SOCK)
                goto check;
 
+       /* init extent info */
+       get_extent_info(&child.ei, &node_blk->i.i_ext);
+       child.last_blk = 0;
+
        if ((node_blk->i.i_inline & F2FS_INLINE_DATA)) {
                if (le32_to_cpu(node_blk->i.i_addr[ofs]) != 0) {
                        /* should fix this bug all the time */
@@ -740,6 +747,7 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
                        }
                }
                DBG(3, "ino[0x%x] has inline data!\n", nid);
+               child.state |= FSCK_INLINE_INODE;
                goto check;
        }
 
@@ -759,13 +767,10 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
                        /* should fix this bug all the time */
                        need_fix = 1;
                }
+               child.state |= FSCK_INLINE_INODE;
                goto check;
        }
 
-       /* init extent info */
-       get_extent_info(&child.ei, &node_blk->i.i_ext);
-       child.last_blk = 0;
-
        /* check data blocks in inode */
        for (idx = 0; idx < ADDRS_PER_INODE(&node_blk->i);
                                                idx++, child.pgofs++) {
@@ -835,6 +840,7 @@ skip:
 
        }
 
+check:
        /* check uncovered range in the back of extent */
        check_extent_info(&child, 0, 1);
 
@@ -844,7 +850,7 @@ skip:
                if (c.fix_on)
                        need_fix = 1;
        }
-check:
+
        if (i_blocks != *blk_cnt) {
                ASSERT_MSG("ino: 0x%x has i_blocks: %08"PRIx64", "
                                "but has %u blocks",

diff --git a/fsck/fsck.h b/fsck/fsck.h
index 89b79b0..e3e6723 100644 (file)
--- a/fsck/fsck.h
+++ b/fsck/fsck.h
@@ -16,6 +16,7 @@
 struct quota_ctx;
 
 #define FSCK_UNMATCHED_EXTENT          0x00000001
+#define FSCK_INLINE_INODE              0x00000002
 
 enum {
        PREEN_MODE_0,