Received: by 2002:ab2:7b86:0:b0:1f7:5705:b850 with SMTP id q6csp1421529lqh; Mon, 6 May 2024 07:19:41 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWqds1/Exj/3DQEOmzcq6qvCTUwoX/AhkXBEYxgyCk6VZ/17kJPh7kKYQG15uEBTyoUKjriKylEcoabEygmGhVd7XOEX4zhg6j+qEXfMg== X-Google-Smtp-Source: AGHT+IGmJirHvODBfVwJVE28mFrTpGN2f4WrAU1/S5Trhtov+Xv5M/fy5tDkEXhKenlnHTp6dyQL X-Received: by 2002:a17:906:d15a:b0:a59:d0fc:7ac5 with SMTP id br26-20020a170906d15a00b00a59d0fc7ac5mr1657699ejb.32.1715005180929; Mon, 06 May 2024 07:19:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715005180; cv=pass; d=google.com; s=arc-20160816; b=Lu/dROGGAG0RZ+YFbLPKEqtD4De8CYKuWGiZ/QxvwEti/EsX5HKnesF+OslkpLybBe TApY7d+Hj6g83Mkreg39cDK4V+rHoUdaY8SBKBfklsg3KAH0aEarcyO+Vi8YI2+Ef7W8 v8KICc+4kCg66Fyp7eoC5nfJLDpDWnW5N7QBVkP2JrdkzRXdfGYRy7zyQlfZ8JSNmCvq +tz19kvTifIELcYrG5u8NICN6Pvqhyz5X0nzDoMho4u14eXYyktJj4ivsXFBluuCeQM3 hKfcze+Qf6YuW10zgikRo7R12fCFhZLfvWZYJc49SXZgLgY0RN+ENjlQA5XxFTyI/bn2 gYZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=BRp/q+glPmUTkTEHRGZbGXW7Afmjc2YeShVtR+hPpZo=; fh=dnh1YrsUyt5UgYK26rqA81QDdkEcBUOSvIufnHNyJEY=; b=IKkx+8es424p+68jSYB9fkoZ6WmN2KMPzyYZ9ShVKyx9sQmRKfyLxMabVo7TIVDzwZ JXrCFJTVidPx5ytlWCkL6YCe8gBWY4tkFxCznQp+GA0OqMIf4PFL6Sxh7ZU2D8LSzil7 TBh9EuU1yOhQXcaHiKfSCMk2MBNc8JP5Yum7sE0lrfjmLBVTPPPSs194eWXyjZUscG8P wChbI6pYyK9eYiNPPD2cMUkTax0Srh89D/uY338n+ZBAFTSI1YYJgbKsGbVWX9e3QNGs gJCnoigcqkJTJ3vLBhncAlZrW8Z7nPKjg47rbVf/AI/50NjssFkSjVsj2DkQd46aiCVG VEMQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-ext4+bounces-2322-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-ext4+bounces-2322-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id yj4-20020a170907708400b00a59beed27absi2075864ejb.108.2024.05.06.07.19.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 07:19:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4+bounces-2322-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=huaweicloud.com); spf=pass (google.com: domain of linux-ext4+bounces-2322-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-ext4+bounces-2322-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A60571F231AB for ; Mon, 6 May 2024 14:19:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 37B2B13D897; Mon, 6 May 2024 14:18:31 +0000 (UTC) X-Original-To: linux-ext4@vger.kernel.org Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19D9D13D2AF; Mon, 6 May 2024 14:18:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715005110; cv=none; b=irOuzwVkLgeIQm8BrdD2pCNX+6fxp8GjfKDJc+HY/jiY8YLCw1HVYX6xlHQ5iA9Wo+3vIyC4LwlrMwGRltW3g/S2xEKdKa2s+ibrMPUgltxwo52JaDo8Z8NNh0tn7zO534ViZgKB+PARRFR6TwMk6B1TA4bD49wbYQM+8BWgqUk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715005110; c=relaxed/simple; bh=QrspUrPk06krE5j4K4ZtIjkNYx6SkjKwoJSbQNtTDOo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JLQy1NXkI5klnf5vuFNp/WisX+5gTFrZfmPzHYvBFlMIAtMgkjQXiuPHXnWjY7qXKrXF0aKr6jXoej8THEd/lmeinPxCAT81w2dQRxnFa3rnyN+5L5lOkN+nh9eRw3ohDAXIcSfUvICrxSuiIsY2J3f8gPrhGSV8+HInmzltlxk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4VY3RH6B5Cz4f3lXC; Mon, 6 May 2024 22:18:19 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 232281A0572; Mon, 6 May 2024 22:18:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAH2RGu5jhmGgSzLw--.22965S6; Mon, 06 May 2024 22:18:25 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, jack@suse.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/9] jbd2: move repeat tag around to remove a repeat check of b_frozen_data Date: Mon, 6 May 2024 22:17:56 +0800 Message-Id: <20240506141801.1165315-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240506141801.1165315-1-shikemeng@huaweicloud.com> References: <20240506141801.1165315-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgAH2RGu5jhmGgSzLw--.22965S6 X-Coremail-Antispam: 1UD129KBjvdXoW7XF1kAr17tFy3ury5Aw1UZFb_yoWfZrX_Xr WkArs7Xws8X3ZrJw4Fka1avrn3K395ur1ku3WxJF9rCF1YqFn5XrnIqrWvqr9rWa1FqrW3 ZrnYgF4FyasxXjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbVkYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r126s 0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xG Y2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14 v26F4UJVW0owA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AK xVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ew Av7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY 6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r 1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CE b7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0x vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAI cVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2Kf nxnUUI43ZEXa7IU8SfO7UUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ We make sure b_frozen_data is not NULL before jump to "repeat" tag, move "repeat" tag around to remove repeat check of b_frozen_data. Signed-off-by: Kemeng Shi --- fs/jbd2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 9a35d0c5b38c..77fcdc76fdfd 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -353,12 +353,12 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction, atomic_set(&new_bh->b_count, 1); spin_lock(&jh_in->b_state_lock); -repeat: /* * If a new transaction has already done a buffer copy-out, then * we use that version of the data for the commit. */ if (jh_in->b_frozen_data) { +repeat: done_copy_out = 1; new_folio = virt_to_folio(jh_in->b_frozen_data); new_offset = offset_in_folio(new_folio, jh_in->b_frozen_data); -- 2.30.0