From nobody Tue Dec 2 00:25:31 2025 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 B0E962D5950 for ; Mon, 24 Nov 2025 23:48:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028105; cv=none; b=kzijEmu0lGoBHjBRCmkYb4oj33C97Ky5/epFEEM6Kx+BC+01JXY3NRK4CcFj6yWodpWCsOH02f6CK/Hs+Ams2WMGAh0zyqYLfBotW3+YV1OWS4Byk4Pp+6RqvFiIvNVqX/sqjhpgJj4m6mEXRyiQj2fhZqjoH9BpkBGj1eGVJxM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028105; c=relaxed/simple; bh=O/JUDf1xQdyUKKqPMxOm/ySwho1/juV+ixb/yhr4OcA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PDboGCFA8WNoq4/K/fXZIZEUcHLP4J7T521TRshimn8F+YiIeahwSEcF8UB6bBopkjT1oNTRGYTnY9rzW2ypO7DNcNXJ6ogHXXRPvR7ysybY8nQYAqHhAuDF0lPlM3j9MffvNjnevpQhD8L4cqitX+biFL8mqbris4tcOHZaaMc= 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=fyRvwB0P; arc=none smtp.client-ip=209.85.210.174 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="fyRvwB0P" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7b86e0d9615so5846198b3a.0 for ; Mon, 24 Nov 2025 15:48:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764028103; x=1764632903; 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=YcqbQ5S4JXXbau3fgh6ZbMU20qGzRcIfkGSPAKTqhkc=; b=fyRvwB0PwJyRFVMmj9BwngRdyh1FxB+k80U4l3kSgDZisjLtKwedeBZ3WsHlXzv4LW smguUguTqO4ye5EUVlnlvpwehhBTfYAqQ/x5sNJHqkipIoz1rFFOO/xvS/2DbnpZKGWU NT7VSCuaOqINYCuFj77EXlZa539ZIvO0qNkghSekpJ5G0ksAQiFu5ykpDGTAVN31tJfk 64rRkgLXr7NPb8V3l2WHWDXRrJhsD4fRRbJez9GqQhUbppDygfJEiz8/8/j6tRnC4bcU 2SvXeNYZLlS+Zu8IJeuLKXeJkDs+fSU0LrJknD6fbkf69ZraKuFmm52FKSe5bUPXEgYv Qv0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764028103; x=1764632903; 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=YcqbQ5S4JXXbau3fgh6ZbMU20qGzRcIfkGSPAKTqhkc=; b=I8mUHLlJpMgk9sD5OEqZcxDQb+g6W8R8cVC2ZIoh14yp1FOeXmeI/FKe/Bg1AZPkqj ImKsMSPjHwnAuC7QPzhGdF+vWwnVPggY0eDLfTcAmo562QeoIFEW4RVn2t3opxzlBY8X r8NmqKLuzmWPTFJbavVUMsXbccK1GEtS84PU70Ej+hkpEkIU1UfFcYGF96wjdIl9nZlt d3bf2TuY7/Kxzxttu8bgnLPvQQCfGbrs6TENzfz3Nwneg44iO3Q2jUrKd1dZnNRCAiKV D1RJS+pPCzQuZszOwlVmGqN4yZHGifeLICLxvxrfL4T+9Xq3IU/naWYy5kb9iWMmna+U F9PA== X-Forwarded-Encrypted: i=1; AJvYcCUIX3CkgEdSgRJbyZncQ8KLPdm7LhYCgauf6OqKt1uFEJp4ZdWlx1snPqiCZAdljNzoVk76rWOEaDsDpCk=@vger.kernel.org X-Gm-Message-State: AOJu0YxMBrfQ78/fI+1WvITZM23ISTq4NAw5P6ks9u9qhr8jZxts+BMi YtMmxJfd97j8yWUSDAybqoftEznKPDnMkoK0IQhUlbGvCIUY2c8Ws/Nf X-Gm-Gg: ASbGncuLLeK8ZMQ4FLr923yL3yDdiGr8aMFZLzJtICG1pHtvIOnq3c4wrg+q81GZncX qNfuKlBFGpjtaVIsFt9KTC5piV0dJcG20gUse5EoHTbFlqVDFMw74ISM2HuRGPAZjGW+YceKui0 uZe58GkTCvmE9hidZMj2NtInBaH71wWNl16SSRt5rJfF5TZzh6l9envGuQQYiNTGhwAUnZNIsTD NV/G+J8ZByRw5/O3MCYHo3lLZbqK+4fzC7f17MQOFzheU/PiSNBmK0H1Tb3AXPUaf7wEPxNySht F74xeShHAHT9GJvGHxMrrKRYq0KJgZ1RX111CbJdkhBRsRJHr+ChMYgxHy+RAjwtroBOY6QF6ib Kl53QBjrcqhXiuclhdxwewhsluSOMzkk9YXblqkS8P4oHVKhVLFNomrO9+wlCfC21/0lP2wfly+ CePChlJwmJq4Q4viQ2XeHixHqNuFUDnRxjHrxYSu2ePQsfOWY= X-Google-Smtp-Source: AGHT+IH9F80PvdpBpbojg7Y02KngkDHXsfXBdGLUzofDSvSvFO71NKJ3uHp3bN/w9c26If04NsQEQQ== X-Received: by 2002:a05:7022:d45:b0:11b:c1ab:bdd0 with SMTP id a92af1059eb24-11c9d863a0amr6183635c88.35.1764028102624; Mon, 24 Nov 2025 15:48:22 -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-11c93cd457dsm72215056c88.0.2025.11.24.15.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 15:48:22 -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 , "Martin K . Petersen" Subject: [PATCH V3 1/6] block: ignore discard return value Date: Mon, 24 Nov 2025 15:48:01 -0800 Message-Id: <20251124234806.75216-2-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 check in blkdev_issue_discard() dead code. In function blkdev_issue_discard() initialize ret =3D 0, remove ret assignment from __blkdev_issue_discard(), rely on bio =3D=3D NULL check to call submit_bio_wait(), preserve submit_bio_wait() error handling, and preserve -EOPNOTSUPP to 0 mapping. Reviewed-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn Reviewed-by: Martin K. Petersen Signed-off-by: Chaitanya Kulkarni Reviewed-by: Anuj Gupta --- block/blk-lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/blk-lib.c b/block/blk-lib.c index 3030a772d3aa..19e0203cc18a 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -87,11 +87,11 @@ int blkdev_issue_discard(struct block_device *bdev, sec= tor_t sector, { struct bio *bio =3D NULL; struct blk_plug plug; - int ret; + int ret =3D 0; =20 blk_start_plug(&plug); - ret =3D __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, &bio); - if (!ret && bio) { + __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, &bio); + if (bio) { ret =3D submit_bio_wait(bio); if (ret =3D=3D -EOPNOTSUPP) ret =3D 0; --=20 2.40.0 From nobody Tue Dec 2 00:25:31 2025 Received: from mail-dl1-f50.google.com (mail-dl1-f50.google.com [74.125.82.50]) (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 2F16D2FB0B3 for ; Mon, 24 Nov 2025 23:48:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028108; cv=none; b=E/Ucti/chp+JMm2EDr9jH8rahGnEpkDOtHGm6rbAwB8JQfOdsZpjc0H3g16FAA20+p2jSbuHY827ALe6CeAWDQnIAa2OV17hMiWm4kPMw7fuN5jF3lmWFsZVxX9aVrWpyzBVajNHfeBeX2ZDluyk2O40mQBcG5r7C78xv06gaCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028108; c=relaxed/simple; bh=ZSqWbY8pVyhLaY6mUuy6f+COqFQf+G+FnHH6zSesNgY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kmKhuAYYWi2knfpwepNbrCzyA9tQmzNgtY3rrBuFJ1n8I3MSW2HqFgTsJfCoPqcZlh4ZKgnaWpQT0Z3Usf+Wb1Dfinne0tLaThZ7F1ucq7LZ/mFO647RD9nOEWBPT9TvppnHs7Mn4UzoZ64o7gbylVy24fBfoFmsZ0m5/HPo5pI= 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=Qb345Nfg; arc=none smtp.client-ip=74.125.82.50 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="Qb345Nfg" Received: by mail-dl1-f50.google.com with SMTP id a92af1059eb24-11b6bc976d6so6067030c88.0 for ; Mon, 24 Nov 2025 15:48:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764028104; x=1764632904; 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=9hEyetpjb5QpX08wjji0bcnEJUxus+pp0XTDG4Zkk6c=; b=Qb345Nfgcp4/TxX2cohDRFWy4A7Z8bs6C7M20K9EPkPwIvIIqvJcVU5QcCx/pVLHI3 +nhvatqStEz4oKY8azbMrTkKu3oSrZpEK5Ep0VUn2e2LA+//TqGUJQZ507mggj2l6Q8h 2k2JC3xiaANHCMK93YTjPDulC/6vXvv/WCeAbIsdWXjd7eeVQs3amslApCRGHRF67apk mIDoYKUYSfblcY8ACgSg3xqpnfQ79aAxC/mH5xofaBHX61fKsqoUtGA44+Jfut+P3fn1 ovfpu1tJJC1qqmeWtiozD/8WxYkFXA3pOrKSpv2x0jJJMl/7tfoY8LWsML2YZEJzoVfO F4+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764028104; x=1764632904; 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=9hEyetpjb5QpX08wjji0bcnEJUxus+pp0XTDG4Zkk6c=; b=m0MeYSkeu8XK+wJDO7P6fimSD991zKe7Lxe3bw1cvzVrxV6LDXExef/ucxef4D2Ezd lgLznZB36riw+087VkrFT95GEm0LMVMHVNUkWowLzzsxFU8UT0KYa8y97nhuJ7Ct9BmV xkqoodWUHGSIYkXc95Xa27fK6gkWIqoPcOocoHwReJHUW3ZS6N3pzCHKoSFzvPq5VpdH 0yDFspoNqTp6eK1dJngvVwsIqO9jPcNlXi1XVV7/+ux8mdBRycGz1JAfuLeFuNFUQNYX G5HxgkrDV6dMGUT9UzAJwtGNrwk2PvrPh+krVqTTC87bZ1jgEs+4WFSrxHKz3MjR1mb/ 2RNA== X-Forwarded-Encrypted: i=1; AJvYcCWi7LtRoWb1Vr9CtsDXqI6CykkhJhKWl5EMSChNLGibghKCkWF9tcGMCph+T3Ky5HpE2ntR9shVBQXs/Y4=@vger.kernel.org X-Gm-Message-State: AOJu0YzcIkaa5XE4+qudNzZjPR4ycESAqXvHDZEtkUkc/Sj3AUrQoSY8 +shOQBk1mFS5hXx1OUFAXyEeqKnZGS7KiMMsZPB+n+6FPVBPkZqE/Ssb X-Gm-Gg: ASbGncvwpERRaMipE9iJ0nxNyK04y/3JBuRrKIoLpJPAwrceemx0BMtbBdaWoQ4o4IE fON6wYNxekNcmDf2698dmt+ZDCQuXM+729B09Iyje33RJ42fo9c91RIhj7SpmnIBpjmerqIZUwE L8ERmOZUJy5F1vxS0eHsW97AqtXN9qlcnS7D+ITQCnulPkihnBj5pJCxbvOPU9YnuuEF0mo79XG vUHUg3vxCaoC7VQvkpdFwT7qWZb2BfQ4JzI4mvgAaxOA4AduyV9LmVBGmnQZDWuIoCxDMU1IHFp hiWJ/2Qpg5bHK0FExYfR+GdJS53VOUTRHCMnl7jDAQu3HLLFbXotZ8tw0oaZTK6W7murrYqYuve FdQXNGHY9T/+hklzjaPYs2OBDsXtJFqWGBy02sWM2HOJ1DLnUkqq1eCAMAgcH7pd3z1FX7tXjjz UQ0HbB2a7B0NyEx1DvC/Z1nBjhwsoj1JGG9DFVzkFP4nA9kvk= X-Google-Smtp-Source: AGHT+IG0os1yUTB1U8y0wFQR2JhU9wfG8RKwx2eS9+a2sORTH4Ie8rtwmUzrvPIYkCFTBjjRJcm4Ew== X-Received: by 2002:a05:7022:ec17:b0:11b:9386:a382 with SMTP id a92af1059eb24-11c9cabc4f0mr8878128c88.21.1764028103912; Mon, 24 Nov 2025 15:48:23 -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-11c93cd457dsm72215229c88.0.2025.11.24.15.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 15:48:23 -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 2/6] md: ignore discard return value Date: Mon, 24 Nov 2025 15:48:02 -0800 Message-Id: <20251124234806.75216-3-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 at call sites dead code. Simplify md to only check !discard_bio by ignoring the __blkdev_issue_discard() value. Reviewed-by: Martin K. Petersen Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Chaitanya Kulkarni Reviewed-by: Anuj Gupta --- drivers/md/md.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 7b5c5967568f..aeb62df39828 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9132,8 +9132,8 @@ void md_submit_discard_bio(struct mddev *mddev, struc= t md_rdev *rdev, { struct bio *discard_bio =3D NULL; =20 - if (__blkdev_issue_discard(rdev->bdev, start, size, GFP_NOIO, - &discard_bio) || !discard_bio) + __blkdev_issue_discard(rdev->bdev, start, size, GFP_NOIO, &discard_bio); + if (!discard_bio) return; =20 bio_chain(discard_bio, bio); --=20 2.40.0 From nobody Tue Dec 2 00:25:31 2025 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 6DF052FD1D9 for ; Mon, 24 Nov 2025 23:48:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028108; cv=none; b=JddNEec7NZN0wCdOwrVho76FlQz2M4BfyIHX+P1WC6kf4M02LJnwOnMX3n7KDiwC25X2MO6Ms7rC+8fULo4s3UxqmHUAGacndg/WHyMDgEGBvBkVaBJHxfGascX4CAzhyX+atjJ4uxEdM66pyDnjgZ8IzxOzFaREXD2m6OhywLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028108; c=relaxed/simple; bh=LiJgbQPzVCy/nNKtdgxFtiNJpUa7IyMaSDSo31f8t5g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WbHyln55CEqw3dksK1oMLNNsgC+qsCRAqEGbTUA2oXoC9sqO6d9yV5v/18GVVCXSAuI137Blru1nsWv2fF/DaFH6t7CgGbl8ijpLr7zCG8GIN8+ieG+MKVZ2hnNyTRxCyPYvhFsAYIcyU6+9iuP3ES2I0K1Vlx7DF1CtsWOuznU= 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=QWk8Up6s; arc=none smtp.client-ip=209.85.214.175 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="QWk8Up6s" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-297e982506fso66618795ad.2 for ; Mon, 24 Nov 2025 15:48:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764028105; x=1764632905; 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=x5IpKKGvYwA44MA2SdIRqzoysh0eqDWrauHh/IuigN8=; b=QWk8Up6sn3lYBV/iB9lZxGmffbRvzawOFw5BgJ2PYx9NHD+dLKfyI3JTqNp513mBEV vrxwKhuZvodq3ta/8e4Xw5HFvIU3H7v0KYCuuUctkaSPfrE0kSCNUQgtQ+u9zI4mJNlR 9JXIbL7tPP5otS/iH/1e1KJW/G0Fae76007IVjPvsLWohUyZ/1bqGEzeiRa5Sr5fu9S1 6c2+gnEtNhBQpacrDuwF0WcYEIRDiSmoF3icXb3ZZUFcoh31hsAyvty0UVz/c3gHwQQh UpRwTviaUPAqYFlZrZd5CHzBVfcGHREOtF3zC0bY4WYeylVTQn3LlTzZSOnjHYrK0m0T TsjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764028105; x=1764632905; 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=x5IpKKGvYwA44MA2SdIRqzoysh0eqDWrauHh/IuigN8=; b=dMkQsICil8Msk1S/Q2EHGwwwfOp6M1jzepXXinRYd7TblmKXSb6/YvXlLiXyQLANh4 /Z5RzXcq5Z5Cubaldz9jRtWaJEIKP7+JszMRf34IJKWSwu3Ez5Db6tBdnLm9MmIapf+f MjMxa0JPPM5oTC8mmbUHXnPxOdyYJ2MR83QLyZrlVCOb6qwnivLBa4M/qbVoAsQzc5Mf SkdCjvE8Nw69R8YuZ+0C6DWjbdHVp+gZn4vi41rtjK28BQleUNhzScuvryjR6AcmP7oS ktgf0yTW5ZFwZpWNv5hl6bk9fc9mL3hODVchX0WED5uE+gOMacuP3Nia3jl+aaiQhbZq jzGQ== X-Forwarded-Encrypted: i=1; AJvYcCWaWBNTHOr4YDHXGnNd4q0x/pWLvxUlZg8Zmpq8zxZcL1sJk4qVJe6NjtbYLIylDASUpdh5X5NfL/ndTmg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzg+yO9pKvhJxZazsm7WeynnqnuJ+6yWal7s6AUXF8CalrjFEg/ +qpTT6mbldPZOkQtj1Ris+rNohI/oyM0dr/6m5q2n8kxoJGPEEYfRy/K X-Gm-Gg: ASbGncvpuEWZQTXTFtpa8swyXd0XV9OktsaXLMpX1Ht8r37R2QjEBIOgP2iNNcq2r26 wcKNljztc8OTkAB4kf9H/74ER4L1LLsI5MT2kbHRirArlvcYdoCHSAds4x9h7VmGIb5QO7JKXmh t8E1Zj6MTV7Wj/b2jIJVGop2siJA9Yc7X5c8Y38o6U2G3lmFTgXOpWPY1GUkiZ4hn0ZqyKLgGzF KnGvfbUQ/dX13duz03eaFlMdW18lp7iL8zxXGPsrm81us690KziPcJKFx565qNvY8DmllakRqPm bxnbygF6dHM2uda86zW0O2BwkUmegD2sXLY+8+r438D99r71PKbOZcVoRlM6EIp7KOaQbUmAFZU NQR+aUGIY2Vw8UbiouiE0wYxlPV2VnNKnKywj5+aafsBxVB6F/UiAO3uAteU6UquSINHSeqJ4Ga Q195PGfkxgFVKjG3mLGIzxqAxV9YiuinvlNacDqpukVM3+BKqg+vTqXWyTag== X-Google-Smtp-Source: AGHT+IGUjnYuQU4uZ65RexnKMVsIkRo4SljblPDkF73f7cjoVp9uAJMvqcbsbNcZ8FiTC+XwEcc2Xg== X-Received: by 2002:a05:7022:6610:b0:11b:9386:a37b with SMTP id a92af1059eb24-11c9d870ef7mr10566206c88.42.1764028105314; Mon, 24 Nov 2025 15:48:25 -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-11c93de6d5csm50934572c88.4.2025.11.24.15.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 15:48:25 -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 3/6] dm: ignore discard return value Date: Mon, 24 Nov 2025 15:48:03 -0800 Message-Id: <20251124234806.75216-4-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 at call sites dead code. For dm-thin change issue_discard() return type to void, in passdown_double_checking_shared_status() remove the r assignment from return value of the issue_discard(), for end_discard() hardcode value of=20 r to 0 that matches only value returned from __blkdev_issue_discard(). Reviewed-by: Martin K. Petersen Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Chaitanya Kulkarni Reviewed-by: Anuj Gupta --- drivers/md/dm-thin.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index c84149ba4e38..77c76f75c85f 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -395,13 +395,13 @@ static void begin_discard(struct discard_op *op, stru= ct thin_c *tc, struct bio * op->bio =3D NULL; } =20 -static int issue_discard(struct discard_op *op, dm_block_t data_b, dm_bloc= k_t data_e) +static void issue_discard(struct discard_op *op, dm_block_t data_b, dm_blo= ck_t data_e) { struct thin_c *tc =3D op->tc; sector_t s =3D block_to_sectors(tc->pool, data_b); sector_t len =3D block_to_sectors(tc->pool, data_e - data_b); =20 - return __blkdev_issue_discard(tc->pool_dev->bdev, s, len, GFP_NOIO, &op->= bio); + __blkdev_issue_discard(tc->pool_dev->bdev, s, len, GFP_NOIO, &op->bio); } =20 static void end_discard(struct discard_op *op, int r) @@ -1113,9 +1113,7 @@ static void passdown_double_checking_shared_status(st= ruct dm_thin_new_mapping *m break; } =20 - r =3D issue_discard(&op, b, e); - if (r) - goto out; + issue_discard(&op, b, e); =20 b =3D e; } @@ -1188,8 +1186,8 @@ static void process_prepared_discard_passdown_pt1(str= uct dm_thin_new_mapping *m) struct discard_op op; =20 begin_discard(&op, tc, discard_parent); - r =3D issue_discard(&op, m->data_block, data_end); - end_discard(&op, r); + issue_discard(&op, m->data_block, data_end); + end_discard(&op, 0); } } =20 --=20 2.40.0 From nobody Tue Dec 2 00:25:31 2025 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 C5D2D313E0F for ; Mon, 24 Nov 2025 23:48:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028110; cv=none; b=ZHKGwhGp37XjOMsa4bVqBdP+v2pr2l037aY8lqYB1YjK4aL75erZKoUXksdHoJvJ4Ia8TO0Po49gX5Jb6I53llAa7DP7SwSjY+rhdnDpB+pf/iObpLUmE5oxHzmTFnOsddcMM6alGaVhjMZ2h/CtxuDHeQAmtMkZKlC5P0Equ10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764028110; c=relaxed/simple; bh=AU6gZMWoUejzxWtNerSxKMr0ZxfAoqmaTtwAxnvaFgQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dhrF5tlXA5vUBGZ7hXfTcQwqxtwXj3Jg/UiH3rkokko2rWexTdz5UPUY526Hipubhc9vZkYseL960Y8mxCEEPS4RYmxAkaiohsL6YLNnogzy2TdkD3PNpewG+amflbl7a+hjeOBfmyEUv92/tVy6L5NLulbSTPPor0ahb9+p5VE= 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=lq6ugxMm; arc=none smtp.client-ip=209.85.215.171 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="lq6ugxMm" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-bc8198fbaf8so4418556a12.1 for ; Mon, 24 Nov 2025 15:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764028107; x=1764632907; 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=KD9mOy62HqGMPaOYo+qJ4jLF6S4k7Y6n0q2fK45fvpw=; b=lq6ugxMmUsfcFcfrN2hI2q5uo3qKC0lcYsCcmMVQlglmNFMZsZRxQws1LIAEQ9d4uR Tcq2enPC5f2a7pXnih0YZW2TCZ70XI3wUfkMuTfGib69MOF1JzD6Fs6/LIU5vH/d4+Ch ag08aC00IeRf+xW32sBk5KEYF8m+h61nwsZ+/7bcxsYi+ssrYvgeM1IEqKzclY1OpKQ2 6UiFw7foQTpFGzCqj5bJD24hwUyzhCoOZkRfXW/xL6M6YXRlHXdGNKSFJVoIflMnPM+Q 8s+3cLIZa+ljYHSQ0HeJqVyMMK5yi1YdC9xLId/M2CrxGewIQJ2b+ufHsNxGMIDiP4wa 0K4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764028107; x=1764632907; 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=KD9mOy62HqGMPaOYo+qJ4jLF6S4k7Y6n0q2fK45fvpw=; b=Du0jPRsd167NMPAYCMiJhZVQVKeyv+Mmqel6eX52ikHzK1DSWxaZbGNdT9RG8TJJ2k kIcZUjwoMCQMg+nmBWQMcI6+qC8iOkzlki5U7L7ERCPrbLp9bQTvBZ7h/8xUM86cDPyi TIZ2FVgziLfEwx/a//laMG7qA2IWmT5FyS2iaOb4+496PyxqTUHBNm/3UfLnou5WPnPl mtW2dd51TXxNz4EqQVrhbAgcgXHNhm9UGOn2KXGjmcvZfjkxcwsGao1BiU/AR/XNCRCe f2Yl1OC03Uyz2Ns1Q0AnpXgAUcdPrTiQpC34tx/OFXWRwbKulrBnYaTL/41XzW+UQuwG yHaw== X-Forwarded-Encrypted: i=1; AJvYcCWAJaCCi+lhfMRRwD5crwD8gI3MxNR35TeiTsLywy+pzCenbac9jUVT4jfKSOy60XENGD64vqljYYT+Z9o=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9YynL941GChMSn3cW0vd7p8ehM26FxB+42HxyUJ2CtsDiZh1Q fw6TlZmaVwEcaZW+FoYg75L9JWRz248HRYcy2WT9q/CKO3hNHPOynlZp X-Gm-Gg: ASbGncv3ewYTA+LC8S2Mzk9aTzu+0Ao5N27MnLrKEESRfErA0TK81yLK3UgtPzui5rK FmU5nLo2gdrkSsPYc95mBhZqilADfxcQh3STS1NFc5HIPUn73JmEaEbfAJzdjn5EpYFc+GwGNK8 oO+OR8zExNuAMtgHYbJAKx26RX/OHp76k6IPFTiv92SBup8b1j7Vt0uDfkFZELI6VC0Cq9ISWLC heo8qvflqRNUaAt3d0BpL+xPJzc8AJSNZPm8CXnPvCrTFpsxrrnV0Mx86A1s3m04PNSAkI5kvMS BzZhfyaWe87EfZGN4Wr0j1cC/r1K/8P98svikqFvxKZEXVWBkWFZ/O+IP3RrEi4GtzA/8qhdcii Ss1SWzSTPf1qmRJRs7wy1vTgh2PZ/eU/XbRrD+uP7Vt2XlP+CjehszR0z+cQ4Rihauzu6TSROd7 qGOLbf2bmHhAe0mdtKeD1RDDE3YVwAIR2pAzNY5jq0LAQs1lc= X-Google-Smtp-Source: AGHT+IGqGWPp3dbaz9P/oMvxkH8tM768OBnx1ym9H6OndIwxHy5XjYnjyPQDBtMIVrKtoM7S3ehYMw== X-Received: by 2002:a05:693c:810c:b0:2a4:3593:9697 with SMTP id 5a478bee46e88-2a719279965mr8848102eec.20.1764028106837; Mon, 24 Nov 2025 15:48:26 -0800 (PST) Received: from localhost (ip70-175-132-216.oc.oc.cox.net. [70.175.132.216]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2a6fc5b122dsm56253333eec.5.2025.11.24.15.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 15:48:26 -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 4/6] nvmet: ignore discard return value Date: Mon, 24 Nov 2025 15:48:04 -0800 Message-Id: <20251124234806.75216-5-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 checking in nvmet_bdev_discard_range() dead code. Kill the function nvmet_bdev_discard_range() and call __blkdev_issue_discard() directly from nvmet_bdev_execute_discard(), since no error handling is needed anymore for __blkdev_issue_discard() call. Reviewed-by: Martin K. Petersen Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Chaitanya Kulkarni Reviewed-by: Anuj Gupta --- drivers/nvme/target/io-cmd-bdev.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd= -bdev.c index 8d246b8ca604..ca7731048940 100644 --- a/drivers/nvme/target/io-cmd-bdev.c +++ b/drivers/nvme/target/io-cmd-bdev.c @@ -362,29 +362,14 @@ u16 nvmet_bdev_flush(struct nvmet_req *req) return 0; } =20 -static u16 nvmet_bdev_discard_range(struct nvmet_req *req, - struct nvme_dsm_range *range, struct bio **bio) -{ - struct nvmet_ns *ns =3D req->ns; - int ret; - - ret =3D __blkdev_issue_discard(ns->bdev, - nvmet_lba_to_sect(ns, range->slba), - le32_to_cpu(range->nlb) << (ns->blksize_shift - 9), - GFP_KERNEL, bio); - if (ret && ret !=3D -EOPNOTSUPP) { - req->error_slba =3D le64_to_cpu(range->slba); - return errno_to_nvme_status(req, ret); - } - return NVME_SC_SUCCESS; -} - static void nvmet_bdev_execute_discard(struct nvmet_req *req) { + struct nvmet_ns *ns =3D req->ns; struct nvme_dsm_range range; struct bio *bio =3D NULL; + sector_t nr_sects; int i; - u16 status; + u16 status =3D NVME_SC_SUCCESS; =20 for (i =3D 0; i <=3D le32_to_cpu(req->cmd->dsm.nr); i++) { status =3D nvmet_copy_from_sgl(req, i * sizeof(range), &range, @@ -392,9 +377,10 @@ static void nvmet_bdev_execute_discard(struct nvmet_re= q *req) if (status) break; =20 - status =3D nvmet_bdev_discard_range(req, &range, &bio); - if (status) - break; + nr_sects =3D le32_to_cpu(range.nlb) << (ns->blksize_shift - 9); + __blkdev_issue_discard(ns->bdev, + nvmet_lba_to_sect(ns, range.slba), nr_sects, + GFP_KERNEL, &bio); } =20 if (bio) { --=20 2.40.0 From nobody Tue Dec 2 00:25:31 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: Anuj Gupta 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 From nobody Tue Dec 2 00:25:31 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 Reviewed-by: Anuj Gupta --- 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