From nobody Tue Dec 2 00:46:07 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B680B335078 for ; Mon, 24 Nov 2025 23:48:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028112; cv=none; b=kh7tXsoIJ8GQLzKBX3OXcYB31t+ubR87wr5tWOZkR8PgWymWcz2/Gf/dpXXyd+3w3b//aMZXrB5gcQh4IPyzwAEMiVfylLH3WzoY5khGhPG5PJqi8B1tCkQwahE2h5Ww3ejy9wdu20rJGNLWMidySBDyC8TyjYi88KZQHgxBHOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028112; c=relaxed/simple; bh=Am7Xg6QJV818HftQaQoJheIX+hzBGkDxL1hHod2VREY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rpW+22xukySj9S2N08kkp1sK72J0//2EWJLyhV6rPFPSfPARb6aAtWBB5ev6CD6xhYve6E/Z4LD2pT/+UUqkxER1I5C/Se8gN7NBQ7CSDpJiHW0oIm2u14KFdQaZWe7TUESghvplXGBBW/ARDicCpbljIO7U1UcBiXinx5DLCTk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=j1p+HPxt; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j1p+HPxt" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2955623e6faso57155055ad.1 for ; Mon, 24 Nov 2025 15:48:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764028108; x=1764632908; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=14mujLSQeTKxSJUy/um1pAgQzTbPorW1qBu/kH6klR8=; b=j1p+HPxtmEJXq1utE07WkQkG5flpsDtFoeQM2jUrBDC6qKWM1nLMeIlhSLC9+NpIYi n4/q62g+t8PqkUImUcZdYWQ9E+IqnqzXK8BOc4daG66olSGcgd8vESZhU183lgbFGWLw bJzyz8FQm1wBtTjkNmWGsBwkrAjSUYPQOuyRvgnuslbcOXS8E7wf8QMGnFn9hXpPg2Uf B7kaMI0ZMw6Nc8ClKDSeJUBWafnApBQlQ8Lb1HDdWYiWqtk5yUaH3XIBnavJX/JbYKOZ yIoeSjOpsBKfdDTkwXA5EHzUnajxEViGSyFL297Yd+gPgWO5Zs6qAg3Wa4VWJ2hkvR42 32SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764028108; x=1764632908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=14mujLSQeTKxSJUy/um1pAgQzTbPorW1qBu/kH6klR8=; b=CCAHOwqsSdN4m7T5QUke0acznR0SKEzEg8jf98HX5h5F9cw4C9lztb2Bt2FP+rmw0B URqjYNa8TN8ZXwziDiSJ6EQ+O3veZfSF49LpK50Xfm8eyDctolWQsjoZOPHLaw5FMfFt LcY1slekQzhXkDsKX0PHbdBZloc7CGmsEvdLJnOQxK6MOZvoQTEwNylmjidBP07XFMhM ehsG5kBJhv4iXG7XXzZKFn2QCjifNb8JPka68Mxe8H50twTtOJW2jxTPeSlAE3jGoQH8 IqR7H2qqXrKAyqjy6vFsZNEcLT0Utg1407TUvNIj4SlL17MMzRVHj+UrcU0WyyOPiP6t vrYw== X-Forwarded-Encrypted: i=1; AJvYcCXD9angcA8tnT6F7+EU5FRI0sZXKtcj5qrv6JKRXHaHccfZ57UusizvemQqRxieBRczEyZUcmbgiSmmD7M=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3d0GX6JCXedvuhuhB76LFKSOGOVN0jLILbSinypi0gXyJ+NEc SmEEkLQ19xhYpbD+H8e2QCCvVgbI/dUs9XnD4B23IcU9SZZTmbifcnDk X-Gm-Gg: ASbGncuJRs/u/bD6zsJgZ3jD1P2KmoWCTFLCXF7AlCjrEm8Vzgix3dOKHCgvWuDWDPP x0xUtRCnYNDILyrhDgF94qcN0oFBkxZOPzTVFmvERIX8L91C4JF/RyNsoe7k6CmX/IoOjgOS3Mx enzzjgi3OGPD5cD2EeJm3+UWMOjPin908ib1T9qCOtF64xZi8OHXEDTclhiGCl6woEPYo7OuqNl jDgg9hTdJ1QQbSLkXy9bp9/uvDtZes3a9ZbQoAc9jWdqXI2ggT7J/MrhyqpVQCR35vB+M3Lg5pL kw8Y/lCQX3avsPzvUuixgxsTavixe9LiITYnn+ea5JKjbrmHHolcgxjdIT5uknv7xvdEHVBbbsY qmiWUb2Lmf00OmMuU/Su5s6zsop72Kf2KACNYkFt1DY6vvsfhPOHpKnDb17h4TvNHsZznfJjh8+ tH9+7TCd2WBk7LK9lK4mepO7sVXLW8UB7N0B7ZLxCdg6Peois= X-Google-Smtp-Source: AGHT+IFryzmc/XiOW9LSO9isjtYB1LRYx6LJmKSX/rJnv82E/9f71NMvnHJMZsWalBLPhm0XU6n7Vg== X-Received: by 2002:a05:7022:ec88:b0:119:e55a:9bf5 with SMTP id a92af1059eb24-11cb3ef2594mr558577c88.17.1764028108043; Mon, 24 Nov 2025 15:48:28 -0800 (PST) Received: from localhost (ip70-175-132-216.oc.oc.cox.net. [70.175.132.216]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-11c93de6d5csm50934844c88.4.2025.11.24.15.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 15:48:27 -0800 (PST) From: Chaitanya Kulkarni To: axboe@kernel.dk, agk@redhat.com, snitzer@kernel.org, mpatocka@redhat.com, song@kernel.org, yukuai@fnnas.com, hch@lst.de, sagi@grimberg.me, kch@nvidia.com, jaegeuk@kernel.org, chao@kernel.org, cem@kernel.org Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@lists.linux.dev, linux-raid@vger.kernel.org, linux-nvme@lists.infradead.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, bpf@vger.kernel.org, Chaitanya Kulkarni , "Martin K . Petersen" , Johannes Thumshirn Subject: [PATCH V3 5/6] f2fs: ignore discard return value Date: Mon, 24 Nov 2025 15:48:05 -0800 Message-Id: <20251124234806.75216-6-ckulkarnilinux@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20251124234806.75216-1-ckulkarnilinux@gmail.com> References: <20251124234806.75216-1-ckulkarnilinux@gmail.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 Content-Type: text/plain; charset="utf-8" __blkdev_issue_discard() always returns 0, making the error assignment in __submit_discard_cmd() dead code. Initialize err to 0 and remove the error assignment from the __blkdev_issue_discard() call to err. Move fault injection code into already present if branch where err is set to -EIO. This preserves the fault injection behavior while removing dead error handling. Reviewed-by: Martin K. Petersen Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Chaitanya Kulkarni Reviewed-by: Chao Yu --- fs/f2fs/segment.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index b45eace879d7..22b736ec9c51 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1343,15 +1343,9 @@ static int __submit_discard_cmd(struct f2fs_sb_info = *sbi, =20 dc->di.len +=3D len; =20 + err =3D 0; if (time_to_inject(sbi, FAULT_DISCARD)) { err =3D -EIO; - } else { - err =3D __blkdev_issue_discard(bdev, - SECTOR_FROM_BLOCK(start), - SECTOR_FROM_BLOCK(len), - GFP_NOFS, &bio); - } - if (err) { spin_lock_irqsave(&dc->lock, flags); if (dc->state =3D=3D D_PARTIAL) dc->state =3D D_SUBMIT; @@ -1360,6 +1354,8 @@ static int __submit_discard_cmd(struct f2fs_sb_info *= sbi, break; } =20 + __blkdev_issue_discard(bdev, SECTOR_FROM_BLOCK(start), + SECTOR_FROM_BLOCK(len), GFP_NOFS, &bio); f2fs_bug_on(sbi, !bio); =20 /* --=20 2.40.0