diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2023-07-12 03:08:58 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2023-07-12 03:23:48 -0700 |
| commit | a35353d208cfcec722392c44639686c6ec805ae7 (patch) | |
| tree | 23d6c96361a3d72ea9dbc67a50589d483cb4a174 | |
| parent | 6222c7ae752d3b87ea187087a1beebbf088d14bb (diff) | |
| download | f2fs-tools-a35353d208cfcec722392c44639686c6ec805ae7.tar.gz | |
f2fs: should use inode when updating file offset
In indirect or double indirect node blocks, we should use parent inode
information to check the offset.
This fixes the below complaint with a reproducer.
$ mount -t f2fs -o discard,compress_extension=* /dev/$DEV $TESTDIR
$ f2fs_io write 1 3944 4 zero buffered $TESTDIR/a
$ umount /dev/$DEV
$ fsck.f2fs /dev/$DEV
Info: MKFS version
"Linux version 6.5.0-rc1-custom (root@file) (gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0, GNU ld (GNU Binutils for Ubuntu) 2.37) #19 SMP PREEMPT_DYNAMIC Mon Jul 10 19:18:40 UTC 2023"
Info: FSCK version
from "Linux version 6.5.0-rc1-custom (root@file) (gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0, GNU ld (GNU Binutils for Ubuntu) 2.37) #19 SMP PREEMPT_DYNAMIC Mon Jul 10 19:18:40 UTC 2023"
to "Linux version 6.5.0-rc1-custom (root@file) (gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0, GNU ld (GNU Binutils for Ubuntu) 2.37) #19 SMP PREEMPT_DYNAMIC Mon Jul 10 19:18:40 UTC 2023"
Info: superblock features = 3088 : extra_attr quota casefold compression
Info: superblock encrypt level = 0, salt = 00000000000000000000000000000000
Info: Segments per section = 1
Info: Sections per zone = 1
Info: total FS sectors = 134217728 (65536 MB)
Info: CKPT version = 284f1e2f
Info: Checked valid nat_bits in checkpoint
Info: checkpoint state = c5 : nat_bits crc compacted_summary unmount
[ASSERT] (fsck_chk_inode_blk:1189) --> ino: 0x6 has i_blocks: 00000007, but has 6 blocks
[FSCK] Max image size: 378 MB, Free space: 65158 MB
[FSCK] Unreachable nat entries [Ok..] [0x0]
[FSCK] SIT valid block bitmap checking [Ok..]
[FSCK] Hard link checking for regular file [Ok..] [0x0]
[FSCK] valid_block_count matching with CP [Fail] [0xf, 0xe]
[FSCK] valid_node_count matching with CP (de lookup) [Ok..] [0x6]
[FSCK] valid_node_count matching with CP (nat lookup) [Ok..] [0x6]
[FSCK] valid_inode_count matched with CP [Ok..] [0x4]
[FSCK] free segment_count matched with CP [Ok..] [0x7f3f]
[FSCK] next block offset is free [Ok..]
[FSCK] fixing SIT types
[FSCK] other corrupted bugs [Fail]
Do you want to fix this partition? [Y/N]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/fsck.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fsck/fsck.c b/fsck/fsck.c index 051510f..78ffdb6 100644 --- a/fsck/fsck.c +++ b/fsck/fsck.c @@ -1430,7 +1430,7 @@ int fsck_chk_idnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode, FIX_MSG("Set indirect node 0x%x -> 0", i); } skip: - child->pgofs += ADDRS_PER_BLOCK(&node_blk->i); + child->pgofs += ADDRS_PER_BLOCK(inode); } } @@ -1472,8 +1472,7 @@ int fsck_chk_didnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode, FIX_MSG("Set double indirect node 0x%x -> 0", i); } skip: - child->pgofs += ADDRS_PER_BLOCK(&node_blk->i) * - NIDS_PER_BLOCK; + child->pgofs += ADDRS_PER_BLOCK(inode) * NIDS_PER_BLOCK; } } |