From patchwork Sat Dec 17 00:46:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 34146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1282089wrn; Fri, 16 Dec 2022 16:48:59 -0800 (PST) X-Google-Smtp-Source: AA0mqf4kYNFZ7cFgRLTpKw1xl8tw+3c8T/Hg7e1T8RzdYyI5N9KiKaqsVOmCvxI7lXqZ0vcGELPI X-Received: by 2002:a17:906:e215:b0:7c1:844d:7447 with SMTP id gf21-20020a170906e21500b007c1844d7447mr17631239ejb.35.1671238139181; Fri, 16 Dec 2022 16:48:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671238139; cv=none; d=google.com; s=arc-20160816; b=QITyQzLpsHE3NB6bmv622We2d1isrtDKthbMajdjbp+1xOuYvDT3HkdaT1T5bJF7FE OFiBZgSI/EWrWedrBTp1SLks/Bs3HN0cZDL/7Q9V4/NCz69LKYRgziVfArGiskuEGvLH I8hzJdcrsdMqOUvyVM3zNshyQ4/i4nOFlOOrPICBLaAlY7aZDWg1EVcY8xSHRUNH4+VP zkqYRxQpSGSPpM0jVTq6xPboNgrYFqFmdxRZFo5NYCnMpQqNedJzF5P/Wvfspbhr9Mru gnVj4ObVnmo6//xCc3UnuX0brIvrVUjxB2j2n55iciN6pj80PzB+EJ38WD9UnPNxr3XZ pSIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O0jWofhmonwYucKE4BxS9QQ3NqBC241ik+3gBm8zMUc=; b=L7an/ROmbEueeXiv9v8d6xP1Gg20t1jw/fGAJGtOJiYl+teVdSg4BMp7RgDKlITDJj n2y5RAfPhA4QdRGbideNYvsKE7NbONm2q/7844BwIADY8+F3Mj/N+3AGndNmDaYyWQpI kDVke95cAx6T6a5KF2qNOaEEnwI/eHZmDeoXIovVQP2X2or+nw6mBF14sW0kj5zLQtTo mcIOqs5MDOCJXteoakjsqKD042OWiwsvlYcKSfe5KGqu/7O3a++LNdhmUg3frTKC2Wj2 5yoy9zphnk5a7/BAFXgSuk8V4mZxsp5VJ0uC5M798YIUixgWRh+k72tMCs49u7vtOi7a FIBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K4qZGtZT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id he15-20020a1709073d8f00b007c6be268253si4321087ejc.608.2022.12.16.16.48.35; Fri, 16 Dec 2022 16:48:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K4qZGtZT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229865AbiLQArU (ORCPT + 99 others); Fri, 16 Dec 2022 19:47:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229806AbiLQArK (ORCPT ); Fri, 16 Dec 2022 19:47:10 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A5574F674 for ; Fri, 16 Dec 2022 16:47:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8D450B81E51 for ; Sat, 17 Dec 2022 00:47:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D2C6C433F1; Sat, 17 Dec 2022 00:47:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671238026; bh=a+6qsiRsvE8gU7rhpY2cUbwxGERZ4kE0rv1dRLXXt8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K4qZGtZTVI4OgZnBDUp8Hs73pxk2e/fRcYnWXZN1RSOFeFHlfqZ8fmo4G3X0HajZ5 4bgk0icvdnFqDgYhjvY5rCIh6BFJuMOaSEgt22qNin/pLicekF3svjYu+fMlYCz4sW bFumKilV+CdPhAw0FP3YMdyhYCZsQZExbS6b0ZFP8moAa1yXlVmUurV8fVISw1zEgx e4NBlaN6xk7f0s9e/Aw8/91uy1mNYVwwYKQz/eOgIDkmAy+2UNrLeY47PeiIwcnLCi YQpbsPzwH+BBMO980sH6iqsLt94sqK7S2hq3i2JXI25P5E0pXAB8+hTELdbFeNYmNe U41CVH2Ko84KA== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH 1/3] f2fs: initialize extent_cache parameter Date: Fri, 16 Dec 2022 16:46:57 -0800 Message-Id: <20221217004659.2092427-2-jaegeuk@kernel.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20221217004659.2092427-1-jaegeuk@kernel.org> References: <20221217004659.2092427-1-jaegeuk@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752420203048264355?= X-GMAIL-MSGID: =?utf-8?q?1752420203048264355?= This can avoid confusing tracepoint values. Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 2 +- fs/f2fs/extent_cache.c | 2 +- fs/f2fs/file.c | 2 +- fs/f2fs/segment.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 505194c8a258..5f589b8b3b5c 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2191,7 +2191,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, sector_t last_block_in_file; const unsigned blocksize = blks_to_bytes(inode, 1); struct decompress_io_ctx *dic = NULL; - struct extent_info ei = {0, }; + struct extent_info ei = {}; bool from_dnode = true; int i; int ret = 0; diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 4721f5b0d8b3..749209005644 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -938,7 +938,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei) static void __update_extent_cache(struct dnode_of_data *dn, enum extent_type type) { - struct extent_info ei; + struct extent_info ei = {}; if (!__may_extent_tree(dn->inode, type)) return; diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index a22677345d23..a0c0e0e9e83d 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2560,7 +2560,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi, struct f2fs_map_blocks map = { .m_next_extent = NULL, .m_seg_type = NO_CHECK_TYPE, .m_may_create = false }; - struct extent_info ei = {0, }; + struct extent_info ei = {}; pgoff_t pg_start, pg_end, next_pgofs; unsigned int blk_per_seg = sbi->blocks_per_seg; unsigned int total = 0, sec_num; diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index e2af10d8132b..f8c76ef278df 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3159,7 +3159,7 @@ static int __get_segment_type_4(struct f2fs_io_info *fio) static int __get_age_segment_type(struct inode *inode, pgoff_t pgofs) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - struct extent_info ei; + struct extent_info ei = {}; if (f2fs_lookup_age_extent_cache(inode, pgofs, &ei)) { if (!ei.age) From patchwork Sat Dec 17 00:46:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 34147 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1282833wrn; Fri, 16 Dec 2022 16:51:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf419jnIoK1s1+dq+JUq5FR9XSegHiAVEK8EXla54oQNQ5Cm9h7m259cfiv7DtRt155Oa0z4 X-Received: by 2002:aa7:cfcc:0:b0:46c:b221:8605 with SMTP id r12-20020aa7cfcc000000b0046cb2218605mr29544566edy.0.1671238297414; Fri, 16 Dec 2022 16:51:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671238297; cv=none; d=google.com; s=arc-20160816; b=DtFB5R1Fa5E6H5kISeIfCL3t0OUtrlSe3Mzh/Ak4ia8cAhlYqTlcfLTwWvGSsJVrJU sGY6NPSYD/rS9YHGOOuHwsRfLs4UuJTYAlcZTgfFXe3BtgoOP63j45uwUhyNGRJmByyp mdE/+ySNTpFCt/5WoplrtsAOocA0IsuBiKlpngkidKJynbtlHIsJpy18HqYcnJRcu76O 913aOnuyOCEI1p7f9A16UKMw180bIQEixpw124WklhozCXzsW9zIQcQx7V0truCG/V+v Pmgk4wdNS0vJb2NUOjz5+Pe7uwRn8tAAhgN3pnW6nIIJE7FixKzJJzGA4w+oYwO6HSKj WN5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5d4nHECykwON0hPPvyXf1dMNYfQwP39CXcvkhJ1tw8o=; b=juI6Tcmeqlu52a4feiYUpeSKwilzD/zkkoyw/d88s983yLWTQJofzncqr9tlMBESTh sk59lTUY2qbSIPPw8gXINzT/ER6RUoLhP+XnESi7GSrQeGxymqd4+79KKpdp0b8czzoV M9b9WScW4Pl6AFYCMsBzzP1RcUfmxseV8RfPK8UmwOXm68jlIKBBy8abS31qvQZ4txSv CQEVl/5SAwwdXS4RZ0/xjCS9IKIPau6eWE/JMMpcm9K972l7idXCrfO/l513D7k1u4Lx iJM89qI8jN0CmF+JBv3HVC0wSKVVTkJqSSGoY4RwhZk5EFsOBvhGwJsHmsLDF740i/po oWxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Lpz+tm1Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d14-20020a056402078e00b0046bb35e06e6si3256999edy.149.2022.12.16.16.51.13; Fri, 16 Dec 2022 16:51:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Lpz+tm1Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229907AbiLQArX (ORCPT + 99 others); Fri, 16 Dec 2022 19:47:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229795AbiLQArK (ORCPT ); Fri, 16 Dec 2022 19:47:10 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A67B4A056 for ; Fri, 16 Dec 2022 16:47:09 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3BDDDB81E50 for ; Sat, 17 Dec 2022 00:47:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5D72C433EF; Sat, 17 Dec 2022 00:47:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671238027; bh=J6kSiIexbLuWJ6COT0xoCdZpCwCFQaT/pl5/3mg1XvE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lpz+tm1Q3l+aJ0nZ1Wla3h/KYYx2TsmkCxMIB49F06gZEzeZwNLqm7EGSNAYXtPh6 Oft7043k5Wg1twT6hxG5TWkglUUB9T4mdnL5wHunomWhOzwHGWRPvW8K/LHtqoHRTN 6OCn6hHqk9mbdCF9RiKg4YChqS7nFITzsmRMFMKDCNodC/ysncynBP75QqOnrYXoYU boYVwGBzFEanx7TZeGpgHrwkb7bSdRUSCKisn60EyQ0lfglYRE6FKxwDeSfh27Ab3B wp+7R2wTMODHahUGKdvBRBSLD1Tofnqjr6lbqDMigSwUuDlA2/G56qDjeKs3JiQald XgBQ1Z8kHR9Kg== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH 2/3] f2fs: don't mix to use union values in extent_info Date: Fri, 16 Dec 2022 16:46:58 -0800 Message-Id: <20221217004659.2092427-3-jaegeuk@kernel.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20221217004659.2092427-1-jaegeuk@kernel.org> References: <20221217004659.2092427-1-jaegeuk@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752420368835258398?= X-GMAIL-MSGID: =?utf-8?q?1752420368835258398?= Let's explicitly use the defined values in block_age case only. Signed-off-by: Jaegeuk Kim --- fs/f2fs/extent_cache.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 749209005644..7bd1e1832412 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -881,7 +881,8 @@ static unsigned long long __calculate_block_age(unsigned long long new, } /* This returns a new age and allocated blocks in ei */ -static int __get_new_block_age(struct inode *inode, struct extent_info *ei) +static int __get_new_block_age(struct inode *inode, struct extent_info *ei, + block_t blkaddr) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); loff_t f_size = i_size_read(inode); @@ -894,7 +895,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei) * block here. */ if ((f_size >> PAGE_SHIFT) == ei->fofs && f_size & (PAGE_SIZE - 1) && - ei->blk == NEW_ADDR) + blkaddr == NEW_ADDR) return -EINVAL; if (__lookup_extent_tree(inode, ei->fofs, ei, EX_BLOCK_AGE)) { @@ -915,14 +916,14 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei) return 0; } - f2fs_bug_on(sbi, ei->blk == NULL_ADDR); + f2fs_bug_on(sbi, blkaddr == NULL_ADDR); /* the data block was allocated for the first time */ - if (ei->blk == NEW_ADDR) + if (blkaddr == NEW_ADDR) goto out; - if (__is_valid_data_blkaddr(ei->blk) && - !f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE)) { + if (__is_valid_data_blkaddr(blkaddr) && + !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) { f2fs_bug_on(sbi, 1); return -EINVAL; } @@ -953,8 +954,7 @@ static void __update_extent_cache(struct dnode_of_data *dn, enum extent_type typ else ei.blk = dn->data_blkaddr; } else if (type == EX_BLOCK_AGE) { - ei.blk = dn->data_blkaddr; - if (__get_new_block_age(dn->inode, &ei)) + if (__get_new_block_age(dn->inode, &ei, dn->data_blkaddr)) return; } __update_extent_tree_range(dn->inode, &ei, type); From patchwork Sat Dec 17 00:46:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 34145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1282013wrn; Fri, 16 Dec 2022 16:48:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvGlCaTgSlEQSvMan7bTZS2KZjU/q+YfU2z50sq7/hH6//9iY5ASwLp3oguz1g445oMyseD X-Received: by 2002:a05:6402:2899:b0:472:cf27:6991 with SMTP id eg25-20020a056402289900b00472cf276991mr9880533edb.22.1671238124358; Fri, 16 Dec 2022 16:48:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671238124; cv=none; d=google.com; s=arc-20160816; b=xHah1MbNGcEDJ6lJ1tMkQqzj/VfD5SZb3EAmpOVUbF2uRLzfhSuPPJ7yPaWQAkERvn sChC4C3BN4jvK8WxZ1vFQmEHoQ2FbtfzfAgyrAt2vtb9N+iFTVXBvFT3LheZ3xAPWXeH yZ+Qe+UPij8EO3FYTPzZQyPTgQvYDKrOZ50SYwMKOKezWKxBWPqGGGfGQSn8j53y8ols vGdjrfJjbq6JcbdR2w9MJVi+hQpNRDdJryXSVvs4vSRx3xHwgcjqchV9T6RRzQWe1OZl H2qFa0iQd6y9eOIGO9o/xO6TyNNJJejTP5F+sIyQeXOyAwcx6IBRHpKvPh2kn8n6RSAm x30w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hKYvtkFrQ5Gu/XGBw1Du7t9DP65ZOOocIcAU545xFeM=; b=ndpSKNOE1Eb4zsDmgJpmZLVXkvjz1oPcpgHcUFiJg7KyHkiTvaBpMwIhh+NxaizpC+ awg0ARh0tZuxokeCTgvl2W4VfU7yQr8q4/QBrEwxbc8gjCY/Re0BZUTbPqqIGn0RrUID a9PNP0+21hwDI/nr8MDNzNWhGSKiLROqnP05/QDDasuW82JoBmd0uzQn83z1Vxw178w9 sO+9oMwHpdhv1U6qDAHh47ZukblXZYB1Vd6lo6NdUCqDyAuKjjXuQ9gWoe7sM0L7ToLx U28rvvldUbA0+qNeLoUidKPJO69ZUMoinEKsNnVCWQAGgtB4i0UStx12NRf7cM+cQJ/U qXKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ItJS5nPx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y19-20020a056402441300b004763231785asi1772561eda.33.2022.12.16.16.48.21; Fri, 16 Dec 2022 16:48:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ItJS5nPx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229811AbiLQArR (ORCPT + 99 others); Fri, 16 Dec 2022 19:47:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbiLQArK (ORCPT ); Fri, 16 Dec 2022 19:47:10 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEB334F643 for ; Fri, 16 Dec 2022 16:47:08 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4C88062300 for ; Sat, 17 Dec 2022 00:47:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DF15C433D2; Sat, 17 Dec 2022 00:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671238027; bh=AzwJwO831ToMtkyVqdqwG2XUb0eIPd36DW9P8p2Lef0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ItJS5nPxoXXc64tEoC8hOfl3x6pXx4brhOBseH0Pyxksxzz8in1nqVZnqERljNmqU brEIUU6hQEmXiUDL3EO7RmSQSIZ39aeG+LvjL+ndsRthYCklXmUKHKbg1ZU1/4euEv DdJjdXqHwWWcNokSfdY0S0YFxiPnuVTTkXUeC9dmmtwPepkh7gwmibrfwTU3/6nCZU hr9DCu5h1Ocig/o8lj4ISjo1vRRGvUhvMbraTdE8qMuigvKPWF1tNvzanI+Qb2U3O4 nsjUThYrohqD37nig5b+Z6mGHivajLd5heX/wzOmPxVyim35RY649jXB+2LRCXELTn 3g0kXPxMvVdyw== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH 3/3] f2fs: should use a temp extent_info for lookup Date: Fri, 16 Dec 2022 16:46:59 -0800 Message-Id: <20221217004659.2092427-4-jaegeuk@kernel.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20221217004659.2092427-1-jaegeuk@kernel.org> References: <20221217004659.2092427-1-jaegeuk@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752420187351982204?= X-GMAIL-MSGID: =?utf-8?q?1752420187351982204?= Otherwise, __lookup_extent_tree() will override the given extent_info which will be used by caller. Signed-off-by: Jaegeuk Kim --- fs/f2fs/extent_cache.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 7bd1e1832412..a510fa57a823 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -888,6 +888,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei, loff_t f_size = i_size_read(inode); unsigned long long cur_blocks = atomic64_read(&sbi->allocated_data_blocks); + struct extent_info tei = *ei; /* only fofs and len are valid */ /* * When I/O is not aligned to a PAGE_SIZE, update will happen to the last @@ -898,17 +899,17 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei, blkaddr == NEW_ADDR) return -EINVAL; - if (__lookup_extent_tree(inode, ei->fofs, ei, EX_BLOCK_AGE)) { + if (__lookup_extent_tree(inode, ei->fofs, &tei, EX_BLOCK_AGE)) { unsigned long long cur_age; - if (cur_blocks >= ei->last_blocks) - cur_age = cur_blocks - ei->last_blocks; + if (cur_blocks >= tei.last_blocks) + cur_age = cur_blocks - tei.last_blocks; else /* allocated_data_blocks overflow */ - cur_age = ULLONG_MAX - ei->last_blocks + cur_blocks; + cur_age = ULLONG_MAX - tei.last_blocks + cur_blocks; - if (ei->age) - ei->age = __calculate_block_age(cur_age, ei->age); + if (tei.age) + ei->age = __calculate_block_age(cur_age, tei.age); else ei->age = cur_age; ei->last_blocks = cur_blocks;