From: Chao Yu <yuchao0@huawei.com>
To: <jaegeuk@kernel.org>
Cc: linux-f2fs-devel@lists.sourceforge.net
Subject: [f2fs-dev] [PATCH 4/4] fsck.f2fs: fix symlink correctly
Date: Mon, 12 Aug 2019 19:45:27 +0800 [thread overview]
Message-ID: <20190812114527.34613-4-yuchao0@huawei.com> (raw)
In-Reply-To: <20190812114527.34613-1-yuchao0@huawei.com>
inode.i_blocks includes inode, xnode and data block count, so, only
fix in below condition:
- i_blocks := 3 (inode + xnode + data_block)
- i_blocks := 2 (inode + data_block)
In addition, it recovers symlink's i_size to 4k rather than i_blocks *
4k.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
fsck/fsck.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/fsck/fsck.c b/fsck/fsck.c
index 1ea8590..61d1a8d 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -1027,16 +1027,15 @@ skip_blkcnt_fix:
free(en);
- if (ftype == F2FS_FT_SYMLINK && i_blocks && i_size == 0) {
+ if (ftype == F2FS_FT_SYMLINK && i_size == 0 &&
+ i_blocks == (i_xattr_nid ? 3 : 2)) {
ASSERT_MSG("ino: 0x%x i_blocks: %lu with zero i_size\n",
nid, (unsigned long)i_blocks);
if (c.fix_on) {
- u64 i_size = i_blocks * F2FS_BLKSIZE;
-
- node_blk->i.i_size = cpu_to_le64(i_size);
+ node_blk->i.i_size = cpu_to_le64(F2FS_BLKSIZE);
need_fix = 1;
FIX_MSG("Symlink: recover 0x%x with i_size=%lu",
- nid, (unsigned long)i_size);
+ nid, (unsigned long)F2FS_BLKSIZE);
}
}
--
2.18.0.rc1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2019-08-12 11:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 11:45 [f2fs-dev] [PATCH 1/4] fsck.f2fs: fix to recover out-of-border inline size Chao Yu
2019-08-12 11:45 ` [f2fs-dev] [PATCH 2/4] fsck.f2fs: fix to check c.fix_on before repair Chao Yu
2019-08-16 1:06 ` Jaegeuk Kim
2019-08-16 1:20 ` Chao Yu
2019-08-20 11:34 ` Chao Yu
2019-08-12 11:45 ` [f2fs-dev] [PATCH 3/4] fsck.f2fs: fix to show removed x_nid correctly Chao Yu
2019-08-12 11:45 ` Chao Yu [this message]
2019-08-15 22:39 ` [f2fs-dev] [PATCH 1/4] fsck.f2fs: fix to recover out-of-border inline size Jaegeuk Kim
2019-08-16 1:03 ` Jaegeuk Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190812114527.34613-4-yuchao0@huawei.com \
--to=yuchao0@huawei.com \
--cc=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).