From patchwork Tue Feb 14 23:57:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 57287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3268699wrn; Tue, 14 Feb 2023 16:01:02 -0800 (PST) X-Google-Smtp-Source: AK7set/448q03QN1cBxhAFRgxBpAwWijrs9fivfHCb+2VAafg8YDX/a1xSE5bX/0G+22u6PFQLKA X-Received: by 2002:a17:902:d2c8:b0:19a:85d9:93fd with SMTP id n8-20020a170902d2c800b0019a85d993fdmr486148plc.22.1676419261876; Tue, 14 Feb 2023 16:01:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676419261; cv=none; d=google.com; s=arc-20160816; b=VPJ7mGFDKM6MHIYD4p16x8fl55kQLC7IG3e9b11Xx1Lo8IK1m/O84xN5CYmgCjqDB2 9JAv+tuhDeKCPfzSDPTEpqsc5ceswOD/gNDLe9qGq0SGNZx5PUxlit1cDp4UWhydv3X0 iFKf6M/qiJK71sQaER86EAdw2GI05D1T81Pag6Tzh13ptrFZQRB8tc5G4n1gtOPwc9uo Uku6azXWDPdf6xdVD8b4zf+LfMywKmhXKKN/FRaqYv+4h3uvzDE92opjRy3Uw4YiOIdH W2MujZM3C0Sr7qybkdaX1XZHfzlPjVD/qii412CKmjgeY0xASdkx8RolSxzoGQvMCxlb zAvQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Su7/GfDnm8hxppew8dTBjh9emSvA0iAgK/bg010jV54=; b=PPhacbx2gjOccXnT/b44pqoKo4Rhu4BM3DXGnrzGG4I6mzTQNgunTDBgdDWxH20vIf P3AIIQo1hsMZ2PH80lL0Oem0SbCzMSXuX+4jPXIxQlne9ujvJSRjzODkWZphKVdcHZhQ fhlz2M69/Ql6RatW67n8/NsooZ35dfZ23ftaFYeXzgi6h22A2vBgQvcwUyHADf/Dl4IK 03CNVdxgMOuXGX+3Na9ACP5WH86pVmXvREdB+pyJUsxNHTBwzIK9Mh8G9h7fhM65gVN1 Kz+NLoOUvRLA3/CrFFXFPalFrKAN0k5bqnELDuAaBG8zgXYqqYtelS08d9Z1XbgAFtSf ccYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Saa/mwlb"; 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 i17-20020a170902e49100b0017ae43612d9si12756655ple.324.2023.02.14.16.00.39; Tue, 14 Feb 2023 16:01:01 -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="Saa/mwlb"; 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 S232295AbjBNX5a (ORCPT + 99 others); Tue, 14 Feb 2023 18:57:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232815AbjBNX5Z (ORCPT ); Tue, 14 Feb 2023 18:57:25 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BE3D83F8; Tue, 14 Feb 2023 15:57:24 -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 08809B81F6A; Tue, 14 Feb 2023 23:57:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A906C433D2; Tue, 14 Feb 2023 23:57:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676419041; bh=DCMDDkt6Ar0ODmaEfXdp73d5AsSIPtAfQxa/qcVDYqA=; h=From:To:Cc:Subject:Date:From; b=Saa/mwlbfMI6YFJ7bkmJBNpeAEwuRbIbLRKUDPmKoc8joVcz/bhPldyDxLcxYmfPE +geEldLRALrNwGILqPpBtr7khBh5tIVPbiZUAwk2OcV8Kvn7zj+5oCqPH5ffXz887D tyLdoJu7e4vKCeuMfCxxsEQMHGESwQAPDvYQxmm2QYsshDDWrVKMQ/gpHS4m2yvEvB NwCPNbBbuiInMbXNkan0B0jjti3ROJ7klOsllOiuQXiQf4DW5SyYM/nqgRbt6c5ahC sP296fruob///JdD9REI3wt5GY+mt2wS0WBzLL0T9pahwynVHVNz8jcT1BxQ8vEVSY vdhjJJ3PGqTuw== From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim , stable@vger.kernel.org Subject: [PATCH] f2fs: Revert "f2fs: truncate blocks in batch in __complete_revoke_list()" Date: Tue, 14 Feb 2023 15:57:19 -0800 Message-Id: <20230214235719.799831-1-jaegeuk@kernel.org> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog 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?1757852928235732850?= X-GMAIL-MSGID: =?utf-8?q?1757853003787272169?= We should not truncate replaced blocks, and were supposed to truncate the first part as well. This reverts commit 78a99fe6254cad4be310cd84af39f6c46b668c72. Cc: stable@vger.kernel.org Signed-off-by: Jaegeuk Kim Reviewed-by: Chao Yu --- fs/f2fs/segment.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 719329c1808c..227e25836173 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -265,19 +265,24 @@ static void __complete_revoke_list(struct inode *inode, struct list_head *head, bool revoke) { struct revoke_entry *cur, *tmp; + pgoff_t start_index = 0; bool truncate = is_inode_flag_set(inode, FI_ATOMIC_REPLACE); list_for_each_entry_safe(cur, tmp, head, list) { - if (revoke) + if (revoke) { __replace_atomic_write_block(inode, cur->index, cur->old_addr, NULL, true); + } else if (truncate) { + f2fs_truncate_hole(inode, start_index, cur->index); + start_index = cur->index + 1; + } list_del(&cur->list); kmem_cache_free(revoke_entry_slab, cur); } if (!revoke && truncate) - f2fs_do_truncate_blocks(inode, 0, false); + f2fs_do_truncate_blocks(inode, start_index * PAGE_SIZE, false); } static int __f2fs_commit_atomic_write(struct inode *inode)