From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C846C3A589 for ; Fri, 16 Aug 2019 01:07:05 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 66A70206C1 for ; Fri, 16 Aug 2019 01:07:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="M+PQSd7b"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="SRvSHniY"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="q6RnIiJR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66A70206C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1hyQht-0005Z9-1F; Fri, 16 Aug 2019 01:07:05 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1hyQhr-0005Z1-1l for linux-f2fs-devel@lists.sourceforge.net; Fri, 16 Aug 2019 01:07:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HE+SLdyKeSF8pfO9cVUZ3ltObr9RjDiTvJ1vBCGnKJQ=; b=M+PQSd7bsv7Aw0d+GrGBFgHqlJ TArSOExn09ORoPmu9F4ErffqByAR/OgIkI0VChaa2Ruwm9r8nVgcBJWgytCh3opb9CiEVWbuMiy/h XLHgCuzl1IKNjomsOHo67T5DXia2TcsKOaJh4yIL8jlmu2RJe6TCIhkluk5Vw/RAo7Zw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=HE+SLdyKeSF8pfO9cVUZ3ltObr9RjDiTvJ1vBCGnKJQ=; b=SRvSHniYRDwdFxn64weWCtbi6h AUJ3mEkClt7vDRsNOsPBtaUKUA62Y3HORsD7jc4J14EV0vOHzLgYAaPxtwjDRggzPQfocbDWmpzuW S23xmJ0rfWKIbMehkhOUvdxM9EhIJ/aAQ50TQatH2Jhg+IQyrW7MJMvy0k2edTeeIxUw=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hyQhZ-004wZ5-BG for linux-f2fs-devel@lists.sourceforge.net; Fri, 16 Aug 2019 01:07:01 +0000 Received: from localhost (unknown [104.132.0.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 46D76206C1; Fri, 16 Aug 2019 01:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565917597; bh=Wy67FpoQDZgmhwaMzRBMXSeNc59R6a1yx68gGHfZeM0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=q6RnIiJRQI7Pw1wgQfsWGabVdudK28e8Tfo7iGxcuUAyolCpc2okLjym1vVbnO5LJ 8Gq0Xu9gHD/f2/7T6ixxQa0IdO3sGdTebxnsb8rVjkqfDcWIXztJG/DJCrLM6XAb2T TzbvvlR87Dsb2fM9xn20YjAPbX5nt0TcwB4EXqn0= Date: Thu, 15 Aug 2019 18:06:36 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: <20190816010636.GB66488@jaegeuk-macbookpro.roam.corp.google.com> References: <20190812114527.34613-1-yuchao0@huawei.com> <20190812114527.34613-2-yuchao0@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190812114527.34613-2-yuchao0@huawei.com> User-Agent: Mutt/1.8.2 (2017-04-18) X-Headers-End: 1hyQhZ-004wZ5-BG Subject: Re: [f2fs-dev] [PATCH 2/4] fsck.f2fs: fix to check c.fix_on before repair X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 08/12, Chao Yu wrote: > We should always set c.bug_on whenever found a bug, then fix them > if c.fix_on is on, otherwise, some bugs won't be shown unless we > enable debug log. > > Signed-off-by: Chao Yu > --- > fsck/fsck.c | 137 +++++++++++++++++++++++++++++++--------------------- > 1 file changed, 83 insertions(+), 54 deletions(-) > > diff --git a/fsck/fsck.c b/fsck/fsck.c > index 7eb599d..91ddd49 100644 > --- a/fsck/fsck.c > +++ b/fsck/fsck.c > @@ -712,12 +712,13 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, > fsck_reada_node_block(sbi, le32_to_cpu(node_blk->i.i_xattr_nid)); > > if (fsck_chk_xattr_blk(sbi, nid, > - le32_to_cpu(node_blk->i.i_xattr_nid), blk_cnt) && > - c.fix_on) { > - node_blk->i.i_xattr_nid = 0; > - need_fix = 1; > - FIX_MSG("Remove xattr block: 0x%x, x_nid = 0x%x", > - nid, le32_to_cpu(node_blk->i.i_xattr_nid)); > + le32_to_cpu(node_blk->i.i_xattr_nid), blk_cnt)) { > + if (c.fix_on) { > + node_blk->i.i_xattr_nid = 0; > + need_fix = 1; > + FIX_MSG("Remove xattr block: 0x%x, x_nid = 0x%x", > + nid, le32_to_cpu(node_blk->i.i_xattr_nid)); > + } Why do we need this change? > } > > if (ftype == F2FS_FT_CHRDEV || ftype == F2FS_FT_BLKDEV || > @@ -730,24 +731,32 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, > > if (f2fs_has_extra_isize(&node_blk->i)) { > if (c.feature & cpu_to_le32(F2FS_FEATURE_EXTRA_ATTR)) { > - if (node_blk->i.i_extra_isize > > - cpu_to_le16(F2FS_TOTAL_EXTRA_ATTR_SIZE)) { > - FIX_MSG("ino[0x%x] recover i_extra_isize " > - "from %u to %u", > - nid, > - le16_to_cpu(node_blk->i.i_extra_isize), > - calc_extra_isize()); > - node_blk->i.i_extra_isize = > - cpu_to_le16(calc_extra_isize()); > - need_fix = 1; > + unsigned int isize = > + le16_to_cpu(node_blk->i.i_extra_isize); > + > + if (isize > F2FS_TOTAL_EXTRA_ATTR_SIZE) { > + ASSERT_MSG("[0x%x] wrong i_extra_isize=0x%x", > + nid, isize); > + if (c.fix_on) { > + FIX_MSG("ino[0x%x] recover i_extra_isize " > + "from %u to %u", > + nid, isize, > + calc_extra_isize()); > + node_blk->i.i_extra_isize = > + cpu_to_le16(calc_extra_isize()); > + need_fix = 1; > + } > } > } else { > - FIX_MSG("ino[0x%x] remove F2FS_EXTRA_ATTR " > - "flag in i_inline:%u", > - nid, node_blk->i.i_inline); > - /* we don't support tuning F2FS_FEATURE_EXTRA_ATTR now */ > - node_blk->i.i_inline &= ~F2FS_EXTRA_ATTR; > - need_fix = 1; > + ASSERT_MSG("[0x%x] wrong extra_attr flag", nid); > + if (c.fix_on) { > + FIX_MSG("ino[0x%x] remove F2FS_EXTRA_ATTR " > + "flag in i_inline:%u", > + nid, node_blk->i.i_inline); > + /* we don't support tuning F2FS_FEATURE_EXTRA_ATTR now */ > + node_blk->i.i_inline &= ~F2FS_EXTRA_ATTR; > + need_fix = 1; > + } > } > > if ((c.feature & > @@ -758,13 +767,17 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, > > if (!inline_size || > inline_size > MAX_INLINE_XATTR_SIZE) { > - FIX_MSG("ino[0x%x] recover inline xattr size " > - "from %u to %u", > - nid, inline_size, > - DEFAULT_INLINE_XATTR_ADDRS); > - node_blk->i.i_inline_xattr_size = > - cpu_to_le16(DEFAULT_INLINE_XATTR_ADDRS); > - need_fix = 1; > + ASSERT_MSG("[0x%x] wrong inline_xattr_size:%u", > + nid, inline_size); > + if (c.fix_on) { > + FIX_MSG("ino[0x%x] recover inline xattr size " > + "from %u to %u", > + nid, inline_size, > + DEFAULT_INLINE_XATTR_ADDRS); > + node_blk->i.i_inline_xattr_size = > + cpu_to_le16(DEFAULT_INLINE_XATTR_ADDRS); > + need_fix = 1; > + } > } > } > } > @@ -772,20 +785,28 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, > > if ((node_blk->i.i_inline & F2FS_INLINE_DATA)) { > unsigned int inline_size = MAX_INLINE_DATA(node_blk); > + block_t blkaddr = le32_to_cpu(node_blk->i.i_addr[ofs]); > > - if (le32_to_cpu(node_blk->i.i_addr[ofs]) != 0) { > - /* should fix this bug all the time */ > - FIX_MSG("inline_data has wrong 0'th block = %x", > - le32_to_cpu(node_blk->i.i_addr[ofs])); > - node_blk->i.i_addr[ofs] = 0; > - node_blk->i.i_blocks = cpu_to_le64(*blk_cnt); > - need_fix = 1; > + if (blkaddr != 0) { > + ASSERT_MSG("[0x%x] wrong inline reserve blkaddr:%u", > + nid, blkaddr); > + if (c.fix_on) { > + FIX_MSG("inline_data has wrong 0'th block = %x", > + blkaddr); > + node_blk->i.i_addr[ofs] = 0; > + node_blk->i.i_blocks = cpu_to_le64(*blk_cnt); > + need_fix = 1; > + } > } > if (!i_size || i_size > inline_size) { > - node_blk->i.i_size = cpu_to_le64(inline_size); > - FIX_MSG("inline_data has wrong i_size %lu", > - (unsigned long)i_size); > - need_fix = 1; > + ASSERT_MSG("[0x%x] wrong inline size:%lu", > + nid, (unsigned long)i_size); > + if (c.fix_on) { > + node_blk->i.i_size = cpu_to_le64(inline_size); > + FIX_MSG("inline_data has wrong i_size %lu", > + (unsigned long)i_size); > + need_fix = 1; > + } > } > if (!(node_blk->i.i_inline & F2FS_DATA_EXIST)) { > char buf[MAX_INLINE_DATA(node_blk)]; > @@ -793,9 +814,12 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, > > if (memcmp(buf, inline_data_addr(node_blk), > MAX_INLINE_DATA(node_blk))) { > - FIX_MSG("inline_data has DATA_EXIST"); > - node_blk->i.i_inline |= F2FS_DATA_EXIST; > - need_fix = 1; > + ASSERT_MSG("[0x%x] junk inline data", nid); > + if (c.fix_on) { > + FIX_MSG("inline_data has DATA_EXIST"); > + node_blk->i.i_inline |= F2FS_DATA_EXIST; > + need_fix = 1; > + } > } > } > DBG(3, "ino[0x%x] has inline data!\n", nid); > @@ -804,20 +828,25 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, > } > > if ((node_blk->i.i_inline & F2FS_INLINE_DENTRY)) { > + block_t blkaddr = le32_to_cpu(node_blk->i.i_addr[ofs]); > + > DBG(3, "ino[0x%x] has inline dentry!\n", nid); > - if (le32_to_cpu(node_blk->i.i_addr[ofs]) != 0) { > - /* should fix this bug all the time */ > - FIX_MSG("inline_dentry has wrong 0'th block = %x", > - le32_to_cpu(node_blk->i.i_addr[ofs])); > - node_blk->i.i_addr[ofs] = 0; > - node_blk->i.i_blocks = cpu_to_le64(*blk_cnt); > - need_fix = 1; > + if (blkaddr != 0) { > + ASSERT_MSG("[0x%x] wrong inline reserve blkaddr:%u", > + nid, blkaddr); > + if (c.fix_on) { > + FIX_MSG("inline_dentry has wrong 0'th block = %x", > + blkaddr); > + node_blk->i.i_addr[ofs] = 0; > + node_blk->i.i_blocks = cpu_to_le64(*blk_cnt); > + need_fix = 1; > + } > } > > ret = fsck_chk_inline_dentries(sbi, node_blk, &child); > if (ret < 0) { > - /* should fix this bug all the time */ > - need_fix = 1; > + if (c.fix_on) > + need_fix = 1; > } > child.state |= FSCK_INLINE_INODE; > goto check; > @@ -999,7 +1028,7 @@ skip_blkcnt_fix: > free(en); > > if (ftype == F2FS_FT_SYMLINK && i_blocks && i_size == 0) { > - DBG(1, "ino: 0x%x i_blocks: %lu with zero i_size", > + 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; > @@ -1012,7 +1041,7 @@ skip_blkcnt_fix: > } > > if (ftype == F2FS_FT_ORPHAN && i_links) { > - MSG(0, "ino: 0x%x is orphan inode, but has i_links: %u", > + ASSERT_MSG("ino: 0x%x is orphan inode, but has i_links: %u", > nid, i_links); > if (c.fix_on) { > node_blk->i.i_links = 0; > -- > 2.18.0.rc1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel