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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT 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 75697C433DF for ; Thu, 18 Jun 2020 12:48:29 +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 432A82070A; Thu, 18 Jun 2020 12:48:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.sourceforge.net header.i=@lists.sourceforge.net header.b="cdakJz5h"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="ZA6U3uNB"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="hNQMpBc1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 432A82070A Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=lists.sourceforge.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Cc:Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive :List-Unsubscribe:List-Id:Subject:Message-Id:Date:To:Sender:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=H7pAszog/p8u+H8UEYeFXe+694/wy38RTlyIlVSUxvc=; b=cdakJz5h3R7HtRDijzeCuCqhvn exCFIhewh/igvd1QiOKeLyDz7pgfb+bw3ybQetSFcVR5ECnKYr1C/GzSSTfp/YBIbx/Q7hi5FA0Ni DIVOyRZIhPX3RWWR8AySQu3+hiGFsKUkdARpCKqRZy3/AfNhM8p9o+qxoWAZqFGu5CNQ=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jlty0-00030L-Sj; Thu, 18 Jun 2020 12:48:28 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jltxy-0002zt-Sf for linux-f2fs-devel@lists.sourceforge.net; Thu, 18 Jun 2020 12:48:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=OmmcRGiv+h3aLFaBNBrDiKm614IHDwJKeaZDKi/He0Y=; b=ZA6U3uNBp2NH/ADx/LMwd67qfn xt2i3spOyc+DeXR3E3fND602szoJ3Rw/ECcm8KmZRZw6WDuo5Ye6l3uQAy7/FxwmGlG+zBypEfDZv JSCd4XKKwv/V4m4757FgF2uVomFTaV3QfCgDs3W1RA1v7qbovnWA5NsIWizB+rTL5mFY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=OmmcRGiv+h3aLFaBNBrDiKm614IHDwJKeaZDKi/He0Y=; b=hNQMpBc1Un214Zt3AdrbqYGjWS /B/iUt+HpMxtjYAl7/vLfKVlzT0uGudTlOEEWuK8G8iy/m30uHVmDmRAYXF43dOXV0ewocp1vvtjT EOScBymhI5JOz+wBicmi3CoF3zqEmqWnqVHCvaKKuE7Lc2nb1lAz8sfxWJSACmQ9q47o=; Received: from mx.wingtech.com ([180.166.216.14] helo=mail.wingtech.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA:256) (Exim 4.92.2) id 1jltxw-00AdjC-01 for linux-f2fs-devel@lists.sourceforge.net; Thu, 18 Jun 2020 12:48:26 +0000 Received: from mx.wingtech.com ([192.168.2.43]) by mail.wingtech.com with SMTP id 05ICmH97002865-05ICmH98002865 for ; Thu, 18 Jun 2020 20:48:17 +0800 Received: from 192.168.51.143 (HELO ZHAOWUYUN.WINGTECH.COM); Thu, 18 Jun 2020 20:48:14 +0800 To: yuchao0@huawei.com, jaegeuk@kernel.org Date: Thu, 18 Jun 2020 20:48:07 +0800 Message-Id: <1592484487-12072-1-git-send-email-zhaowuyun@wingtech.com> X-Mailer: git-send-email 2.7.4 X-Headers-End: 1jltxw-00AdjC-01 Subject: [f2fs-dev] [PATCH] f2fs-tools: set cold flag for non-dir node 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: , From: zhaowuyun--- via Linux-f2fs-devel Reply-To: zhaowuyun@wingtech.com Cc: zhaowuyun@wingtech.com, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Wuyun Zhao Signed-off-by: Wuyun Zhao --- fsck/dir.c | 1 + fsck/node.c | 1 + fsck/node.h | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/fsck/dir.c b/fsck/dir.c index 5f4f75e..dc03c98 100644 --- a/fsck/dir.c +++ b/fsck/dir.c @@ -522,6 +522,7 @@ static void init_inode_block(struct f2fs_sb_info *sbi, node_blk->footer.nid = cpu_to_le32(de->ino); node_blk->footer.flag = 0; node_blk->footer.cp_ver = ckpt->checkpoint_ver; + set_cold_node(node_blk, S_ISDIR(mode)); if (S_ISDIR(mode)) { make_empty_dir(sbi, node_blk); diff --git a/fsck/node.c b/fsck/node.c index 229a99c..1d291ca 100644 --- a/fsck/node.c +++ b/fsck/node.c @@ -79,6 +79,7 @@ block_t new_node_block(struct f2fs_sb_info *sbi, node_blk->footer.ino = f2fs_inode->footer.ino; node_blk->footer.flag = cpu_to_le32(ofs << OFFSET_BIT_SHIFT); node_blk->footer.cp_ver = ckpt->checkpoint_ver; + set_cold_node(node_blk, S_ISDIR(le16_to_cpu(f2fs_inode->i.i_mode))); type = CURSEG_COLD_NODE; if (IS_DNODE(node_blk)) { diff --git a/fsck/node.h b/fsck/node.h index 6bce1fb..99139b1 100644 --- a/fsck/node.h +++ b/fsck/node.h @@ -161,6 +161,17 @@ static inline int is_node(struct f2fs_node *node_blk, int type) return le32_to_cpu(node_blk->footer.flag) & (1 << type); } +static inline void set_cold_node(struct f2fs_node *rn, bool is_dir) +{ + unsigned int flag = le32_to_cpu(rn->footer.flag); + + if (is_dir) + flag &= ~(0x1 << COLD_BIT_SHIFT); + else + flag |= (0x1 << COLD_BIT_SHIFT); + rn->footer.flag = cpu_to_le32(flag); +} + #define is_fsync_dnode(node_blk) is_node(node_blk, FSYNC_BIT_SHIFT) #define is_dent_dnode(node_blk) is_node(node_blk, DENT_BIT_SHIFT) -- 2.7.4 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel