From nobody Tue Feb 10 01:58:50 2026 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (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 438201662E4; Wed, 31 Jul 2024 06:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722407132; cv=none; b=JSKQ0gCDnO2uVSiZtTDPnPkcJlYtqrKi18kqd+KKuHxaGD2qonBfX8zB4LTwrddSdbtiHeWI7mxrG5qHm7CxO2x1XLt6RlA26gCRuhEiyeROcPcU1WR3nAqiDPA17JWxpt+2FSOf9H3G8jktz47/TGIf0EAvd0EtM9B+7NEXc8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722407132; c=relaxed/simple; bh=Ii47xLEnsPPvFGzTDucLIzwYr53fdNVep75EufIQkSA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iWYwqoaEzrIEOk5qISZ86WjGcfX9Yt7sjOegWVmn7yBXdr/NmOGHn6ikzl4r2zrzhbl1nnRwgkE6yhO1gHLRRYu2X4b7avZkD7UpKZz9/ZpODUMCj2cUlDMuyfoxAEG6ShtCZQleK8uZck7ha2zA1FSo3nE5UsbauCoOcbw60MQ= 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.56 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 dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4WYhsk3Hx2z4f3jsY; Wed, 31 Jul 2024 14:25:14 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 5C6B11A06D7; Wed, 31 Jul 2024 14:25:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgA3jE7T2KlmaFNcAQ--.8748S10; Wed, 31 Jul 2024 14:25:27 +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 v2 8/8] jbd2: remove unneeded check of ret in jbd2_fc_get_buf Date: Wed, 31 Jul 2024 14:22:47 +0800 Message-Id: <20240731062247.2380440-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240731062247.2380440-1-shikemeng@huaweicloud.com> References: <20240731062247.2380440-1-shikemeng@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: cCh0CgA3jE7T2KlmaFNcAQ--.8748S10 X-Coremail-Antispam: 1UD129KBjvdXoWruF4rZr15uFWUKw1rXr1rtFb_yoW3Wrc_Xr W0vr97ZrZxWr13Ar4rC348urnI9ws7ur1ku34xt392kF1UJ3W5J34DJ398Jr9rWayvqF13 Cw1q93yF9F9FkjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbVkYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r126s 0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC64kIII0Yj41l84x0c7CEw4AK67xG Y2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14 v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AK xVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ew Av7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY 6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r 1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CE b7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0x vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAI cVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2Kf nxnUUI43ZEXa7IU13l1DUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ Content-Type: text/plain; charset="utf-8" Simply return -EINVAL if j_fc_off is invalid to avoid repeated check of ret. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- fs/jbd2/journal.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index e89d777ded34..9d0f6735f8e6 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -841,12 +841,8 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_= head **bh_out) fc_off =3D journal->j_fc_off; blocknr =3D journal->j_fc_first + fc_off; journal->j_fc_off++; - } else { - ret =3D -EINVAL; - } - - if (ret) - return ret; + } else + return -EINVAL; =20 ret =3D jbd2_journal_bmap(journal, blocknr, &pblock); if (ret) --=20 2.30.0