From nobody Tue Dec 2 00:46:08 2025 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 2453F335573 for ; Mon, 24 Nov 2025 23:48:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028112; cv=none; b=iUa5ec0zXLzAeqLv6WHdO8T5gU3ufHPOViSrblidGxp5JDvED1zUJkvVoy7F51shBiJU0bXny2NTr1qCneSOPqtwWn8Sldi6Ni+6k1zXjW60EwGjlYzi0jXVBKS0qrze1T8/I1UXTQxA22K8CZlPVCkpU7+jYX53C42/ONvuKII= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028112; c=relaxed/simple; bh=kQ2j8AcbSkYMUbwaE2qHb1RGU9aI9t4eoz6R/zOVZnw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZyjCfl8ytb9bH94LXxvx0GJrgd8UOG7FV3N4DV4vQfp9c8r0ID/Gbwsg5liDBBuDVxXDKclRqeJbIRb0VGtrnrMX4GxGgD4bcbYdgrIltW9J4oAadmcHSPgSOTUEOGpAAqdSh1NQZ9MKNzR6df5JBqO67BXi/95S3YI8WshNNPs= 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=aszSVSLB; arc=none smtp.client-ip=209.85.210.176 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="aszSVSLB" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-7b8bbf16b71so5845785b3a.2 for ; Mon, 24 Nov 2025 15:48:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764028109; x=1764632909; 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=XG0OrcuNbwg29Sl2OBnaF07hgRH6+GSGFVprGloS+Vs=; b=aszSVSLBvcbO5a8Tv8KwbkQP6f0AduPLlmIOLXqR87+0BAYiqebOPMPr5/uRBFW6lP 21qTp9xWlNJEr/DX8+knWX2GNh2zAt3mAqhtggrqXUDCu5+1NIXjsID1GXZFZY8G0VOu 4qE+dAhesPF2BZl/F6yg9EmKAnYH8Rh42PM+xc/PjpsVgp7CTR9zx3f4/u1SY+ZVvCAd WxiKxZsVHsqMtB4qJcASjeGpo8BBQJgT9bh/5Y/pANbEchkdG9f52hqf9bZnqaGACP95 gzdW0d7MLu8YqieJxgPYLsyxwdf7r31/cfcZTugys2y8+aNfd95pEr+ocQyXfJGMP2GV B0Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764028109; x=1764632909; 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=XG0OrcuNbwg29Sl2OBnaF07hgRH6+GSGFVprGloS+Vs=; b=P1HjHrmgUzxnFakVEJFxW+K94uiBh2GXXGiaVjWtwSGBXs89i9/G/KBPzVBo8MFxKv eQYr8ApO+WonJrJYQgJHAuSnbm4MzGhvry2j1dLpaYn/kbPMKWIQI1YYIZ/yy8epEXva /9bXUtB1H+got1+5lu6kxCp9jKDQbSQdgSIej1c5Bi92khwE8BTA1mpH92pr4wl4TDvx E6JGfoYmA57DxQbdgQvqtf2jpI1GKb32kILpV22s8diuvk2r8UgmXSX2Gq+CcTOzaJIV pt/+ewNk08G+8wbS0SVHaoRoXU3C2GHusQl/mF3x88dR51z7i9d6OsVhDlTBFogTSsOE grFQ== X-Forwarded-Encrypted: i=1; AJvYcCWUmPd0gBeAX2XOmQonO7olq+DW3bBvZk5TNc71uceTlTzmdhsHH+q7TH+fQbMQogTQJmkW1rIEOAUWo0M=@vger.kernel.org X-Gm-Message-State: AOJu0YwWLR/ole18g9OuS9i77RVFxMHk3Sc5QaJ6MNaIt4qMju5/FSI5 ScEY12EOvrZK2hJC2zmbnFiXHeSfgup2ZrgF071ZCpAilR/shuRwUDLJ X-Gm-Gg: ASbGncsvQM21w5Vw3RlxY+56+1z3IP+apeR5bFlEH0qpF9VFcwa/UwGXa/QJhRHU5k7 Jd+bmIr3gnT2dS+NAqr2xOXMnNz+C98GE6Fl26AS63Bvd+NpYTddpwXkd7E3d5pSuMCmSObKyPn JH2/w6D+wdKOmC0IEnhZXRShMq+Z9vSDHVnfWyhbaqcye4YRfISHsw593Ghci9Z6rP0M9BjMUGy iksAJ6gnVArYi7HSTgZ3Htdkt1qXARU3YuUgibrFrvuXSsjdnqXIfxvabfreXLFTd3hc0W2KmTD VjVTj9WEeQ/G+ZNpIMlziVuu0hcppLmMmymnNxLFIHuL3gh1jRL01Ici1NN1NpD68hjFBZEwZfy 2oWcLsvz6kY9dE6imuljeh5k0h0lBhVpztJTxQ3693z4xC5R2bPI/O4DQgx5lK5CUTU6anaCDPR NgdhWm9+F69PZLVj31YncCo530/WIs/C+mD6Z98rkvW+uum3g= X-Google-Smtp-Source: AGHT+IGsJc67nHzRSaGN7J/UxQrgH96kyTpeGXuRk0eYF4SOZV90nUCcoNrz1/tW/LtO3V9QCDnQOg== X-Received: by 2002:a05:7022:e994:b0:11b:ade6:45bd with SMTP id a92af1059eb24-11c9d708d4amr8669000c88.8.1764028109428; Mon, 24 Nov 2025 15:48:29 -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-11c93db4a23sm76988653c88.2.2025.11.24.15.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 15:48:29 -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 , Johannes Thumshirn Subject: [PATCH V3 6/6] xfs: ignore discard return value Date: Mon, 24 Nov 2025 15:48:06 -0800 Message-Id: <20251124234806.75216-7-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 all error checking in XFS discard functions dead code. Change xfs_discard_extents() return type to void, remove error variable, error checking, and error logging for the __blkdev_issue_discard() call in same function. Update xfs_trim_perag_extents() and xfs_trim_rtgroup_extents() to ignore the xfs_discard_extents() return value and error checking code. Update xfs_discard_rtdev_extents() to ignore __blkdev_issue_discard() return value and error checking code. Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Chaitanya Kulkarni --- fs/xfs/xfs_discard.c | 27 +++++---------------------- fs/xfs/xfs_discard.h | 2 +- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c index 6917de832191..b6ffe4807a11 100644 --- a/fs/xfs/xfs_discard.c +++ b/fs/xfs/xfs_discard.c @@ -108,7 +108,7 @@ xfs_discard_endio( * list. We plug and chain the bios so that we only need a single completi= on * call to clear all the busy extents once the discards are complete. */ -int +void xfs_discard_extents( struct xfs_mount *mp, struct xfs_busy_extents *extents) @@ -116,7 +116,6 @@ xfs_discard_extents( struct xfs_extent_busy *busyp; struct bio *bio =3D NULL; struct blk_plug plug; - int error =3D 0; =20 blk_start_plug(&plug); list_for_each_entry(busyp, &extents->extent_list, list) { @@ -126,18 +125,10 @@ xfs_discard_extents( =20 trace_xfs_discard_extent(xg, busyp->bno, busyp->length); =20 - error =3D __blkdev_issue_discard(btp->bt_bdev, + __blkdev_issue_discard(btp->bt_bdev, xfs_gbno_to_daddr(xg, busyp->bno), XFS_FSB_TO_BB(mp, busyp->length), GFP_KERNEL, &bio); - if (error && error !=3D -EOPNOTSUPP) { - xfs_info(mp, - "discard failed for extent [0x%llx,%u], error %d", - (unsigned long long)busyp->bno, - busyp->length, - error); - break; - } } =20 if (bio) { @@ -148,8 +139,6 @@ xfs_discard_extents( xfs_discard_endio_work(&extents->endio_work); } blk_finish_plug(&plug); - - return error; } =20 /* @@ -385,9 +374,7 @@ xfs_trim_perag_extents( * list after this function call, as it may have been freed by * the time control returns to us. */ - error =3D xfs_discard_extents(pag_mount(pag), extents); - if (error) - break; + xfs_discard_extents(pag_mount(pag), extents); =20 if (xfs_trim_should_stop()) break; @@ -496,12 +483,10 @@ xfs_discard_rtdev_extents( =20 trace_xfs_discard_rtextent(mp, busyp->bno, busyp->length); =20 - error =3D __blkdev_issue_discard(bdev, + __blkdev_issue_discard(bdev, xfs_rtb_to_daddr(mp, busyp->bno), XFS_FSB_TO_BB(mp, busyp->length), GFP_NOFS, &bio); - if (error) - break; } xfs_discard_free_rtdev_extents(tr); =20 @@ -741,9 +726,7 @@ xfs_trim_rtgroup_extents( * list after this function call, as it may have been freed by * the time control returns to us. */ - error =3D xfs_discard_extents(rtg_mount(rtg), tr.extents); - if (error) - break; + xfs_discard_extents(rtg_mount(rtg), tr.extents); =20 low =3D tr.restart_rtx; } while (!xfs_trim_should_stop() && low <=3D high); diff --git a/fs/xfs/xfs_discard.h b/fs/xfs/xfs_discard.h index 2b1a85223a56..8c5cc4af6a07 100644 --- a/fs/xfs/xfs_discard.h +++ b/fs/xfs/xfs_discard.h @@ -6,7 +6,7 @@ struct fstrim_range; struct xfs_mount; struct xfs_busy_extents; =20 -int xfs_discard_extents(struct xfs_mount *mp, struct xfs_busy_extents *bus= y); +void xfs_discard_extents(struct xfs_mount *mp, struct xfs_busy_extents *bu= sy); int xfs_ioc_trim(struct xfs_mount *mp, struct fstrim_range __user *fstrim); =20 #endif /* XFS_DISCARD_H */ --=20 2.40.0