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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C0482C41517 for ; Fri, 9 Aug 2019 10:53: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 8AFB02086D for ; Fri, 9 Aug 2019 10:53:29 +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="SRzZ435N"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="JjQWOguk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AFB02086D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com 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 1hw2WW-0003rz-ND; Fri, 09 Aug 2019 10:53:28 +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 1hw2WW-0003rj-46 for linux-f2fs-devel@lists.sourceforge.net; Fri, 09 Aug 2019 10:53:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From: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=3D6begZLYkO/j5vRb0Wbx4tYr0lqDgdVVE+Q5lI+kOc=; b=SRzZ435NC2vq29L+i54W5CSPgl HsWXSFmLhPSDRy8zk2EiHmAY/4KbtgEXVMtABzlReYCNlYHA+LDcviSHb4osFCj6okpO7cSHMEywR kQTat9l7m3dYnWtUy0uKk9/5wL+/54pfjxErBFe/tpwWOY7BKX0tm9tzmhKXB/foE1YQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject: CC:To:From: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=3D6begZLYkO/j5vRb0Wbx4tYr0lqDgdVVE+Q5lI+kOc=; b=JjQWOgukAQ0uexmyHXa/Ee+yrh 6g4sMT/h7OONZoyHPCj+OX9xV9JwGh4uLnsDmjZbsV1PAQOgyOV8N/eChKfd6pOXaKnl/ivkaBu7c sMHuf73v0NHS/8Gt9+1QNc6Y2pfaIYWz8WX2t/zlpVmuzfrtlcFxfFeCuBLerihunnHI=; Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hw2WU-00Frqz-Mu for linux-f2fs-devel@lists.sourceforge.net; Fri, 09 Aug 2019 10:53:28 +0000 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id EA680EEF0DCC6576348C; Fri, 9 Aug 2019 18:53:18 +0800 (CST) Received: from szvp000203569.huawei.com (10.120.216.130) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.439.0; Fri, 9 Aug 2019 18:53:12 +0800 From: Chao Yu To: Date: Fri, 9 Aug 2019 18:52:56 +0800 Message-ID: <20190809105302.79876-4-yuchao0@huawei.com> X-Mailer: git-send-email 2.18.0.rc1 In-Reply-To: <20190809105302.79876-1-yuchao0@huawei.com> References: <20190809105302.79876-1-yuchao0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.120.216.130] X-CFilter-Loop: Reflected X-Headers-End: 1hw2WU-00Frqz-Mu Subject: [f2fs-dev] [PATCH 04/10] fsck.f2fs: introduce current_sit_addr() for cleanup 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 Just clean up, no logic change. Signed-off-by: Chao Yu --- fsck/mount.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/fsck/mount.c b/fsck/mount.c index bed22d5..eed27bf 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -1700,13 +1700,12 @@ static inline void check_seg_range(struct f2fs_sb_info *sbi, unsigned int segno) ASSERT(segno <= end_segno); } -void get_current_sit_page(struct f2fs_sb_info *sbi, - unsigned int segno, struct f2fs_sit_block *sit_blk) +static inline block_t current_sit_addr(struct f2fs_sb_info *sbi, + unsigned int segno) { struct sit_info *sit_i = SIT_I(sbi); unsigned int offset = SIT_BLOCK_OFFSET(sit_i, segno); block_t blk_addr = sit_i->sit_base_addr + offset; - int ret; check_seg_range(sbi, segno); @@ -1714,24 +1713,23 @@ void get_current_sit_page(struct f2fs_sb_info *sbi, if (f2fs_test_bit(offset, sit_i->sit_bitmap)) blk_addr += sit_i->sit_blocks; - ret = dev_read_block(sit_blk, blk_addr); - ASSERT(ret >= 0); + return blk_addr; } -void rewrite_current_sit_page(struct f2fs_sb_info *sbi, +void get_current_sit_page(struct f2fs_sb_info *sbi, unsigned int segno, struct f2fs_sit_block *sit_blk) { - struct sit_info *sit_i = SIT_I(sbi); - unsigned int offset = SIT_BLOCK_OFFSET(sit_i, segno); - block_t blk_addr = sit_i->sit_base_addr + offset; - int ret; + block_t blk_addr = current_sit_addr(sbi, segno); - /* calculate sit block address */ - if (f2fs_test_bit(offset, sit_i->sit_bitmap)) - blk_addr += sit_i->sit_blocks; + ASSERT(dev_read_block(sit_blk, blk_addr) >= 0); +} - ret = dev_write_block(sit_blk, blk_addr); - ASSERT(ret >= 0); +void rewrite_current_sit_page(struct f2fs_sb_info *sbi, + unsigned int segno, struct f2fs_sit_block *sit_blk) +{ + block_t blk_addr = current_sit_addr(sbi, segno); + + ASSERT(dev_write_block(sit_blk, blk_addr) >= 0); } void check_block_count(struct f2fs_sb_info *sbi, -- 2.18.0.rc1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel