From mboxrd@z Thu Jan 1 00:00:00 1970 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 3E4DC298987 for ; Mon, 24 Nov 2025 02:57:47 +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=1763953070; cv=none; b=mPZroV0DBCMImFh/SWlz6XiMlZzJIwSaqUHQ1g1j/bsq/HstSxgHjAM6taPM6OP+QjYl6fm8PwnPE22JByhuDb3vwDwuFAAdZVCC7GdBYrvKuDtQjxdgUCGa7v6zyvEOLLeyi7mRW0VQrdC2AiBNJIY1GGK7kZnvmBxgHv8ejVY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763953070; c=relaxed/simple; bh=CHhIhTF7NAlbIHo/7TRGjQSC5FGBam+nH0hmtRIrdo4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DDiZxwsd1epKjT2HZ9tBo2TKVF0gkLNwwjm73mx6DdYnWRYH6XPfLFI4zu6xlxdfFgx1CqBEctWY71q9Pabjefzd/WJNdgmDehH1FdbX3Xpe5kK5gfjeOA+YNk+PEusGWtudhJkBDY3Fs3DB9Vzq9GbW2Tr38Ctu+qu0R8zky7U= 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=jDz/DONC; 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="jDz/DONC" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so3191632b3a.0 for ; Sun, 23 Nov 2025 18:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763953067; x=1764557867; 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=sNwYZl+W2fvcXiK6f1dLRuPmVDUoM4hiP4tOVDl+CUs=; b=jDz/DONCcktAyNl+leNQ33o3sbS/lb4kKl56q4xXHXX/kr0HC7xVs16t0EH9RbWuaS 0KwWYTJNfWKNSmWU5nt9F2egBjeEU8JYE1re9nCLIvyPnGYtHItQjjPCaUK6mZCk2THJ sQ+n3HQTej8WS68aHQrgQmnDJD8x1hPgbE3HX0CNjwhm3B3Cew6qNPGEKO70nx2kbUO4 HNzmjNzsQNbncqfwsvqK3aQn2m/e/h8JsEbLnt2fI3sKPIeEYiRQMCoktHtqYMW013hm rVHp+8UVBJWmNjjEH9B1cI+gVTXO9yznDitJhkS7Py0+rjcP7etm14yoN/BI1lN1U7YS sbew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763953067; x=1764557867; 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=sNwYZl+W2fvcXiK6f1dLRuPmVDUoM4hiP4tOVDl+CUs=; b=D/FmRHEFPXUhH9mLomWIfIXyeP2T7xG32F2KDidLmI4LgFwvyy2zX2R0mxqduyjEvc B8L4pIVx20zwHs/20v8EmI3hXDp0LlRMkAepU46/wOH8InyzVNLhbF7v3LHIoOs5Bq4i TEyF+pBCglUL9X4WR6HjmkCBrbG464VkaVjKHaqP1/IO0BWBrAE4nWC4PYCHMksRIhOE xrJF5Ix7is4GXz8fXBwZbEh5+gJvvY9HunhyBv406yWf8ZsEOxn9qb5P7B5swGknLnsL vxZLChjaJ2m+hCA8BLMAUGLXv9E5U0GtMuYjJFJP/W6s1L0G4qlzhEsiOUL1ozcswb5C tcqQ== X-Forwarded-Encrypted: i=1; AJvYcCW0bJoPy/5eausHlceSb0OgApeEUi+wvZ+zw7tIH76P2DPetCtEqhAg3Dk9idU6Qpm3DmOgIEIxw8CASME=@vger.kernel.org X-Gm-Message-State: AOJu0YyKZTSg3Ha9lraHVR9/Voz0/KExpPCM7oI6Huz5Z/98JnuLQydx 9zr32khyYt1FiMxZUQnUsXEdwaHBujAXHz7kgdvxnIRIoSZLLsYZ8b3l X-Gm-Gg: ASbGncspjWBsw967S1Nqupr5y4AQaWxHT1rhNuOvSZjDgTNw9aC5v47GfKuWyHyEfUI zYVDfE45NsdbbAlxltAZ5Lz317XlB/V8DeVa2LNUGaIDurPwZJQbLGevrgsCWTJgzOZZAEngirn DQsHfs3dybYTqmlTtqLmJpbShND6d+JO70qD0+NTMFHSYim99mwG5Yij5MRLiNnnXf7PPFNcKcR k5KpLXH7vaKr/wWcwhkJN9bfODR7fRCWhDnEUQOJOK0pRQMA/BgbnDLBqFTiDiQBmOzZgrc9tgF 65rZvAE/m/NnSccxW1feoBHT3RuAD4cGmo0Gb3JliSRbZ21HizfuNuYycmmooYgRkfc1yAnVTkX l4PqI81dcVvp5HgVuQiT4Vr6lFZsdQagG7/uGgX/jQTb02SDM9eofS2pBkSqjmr6EveL8qE8sJb riXbd+obr1A4akv2NcCHlpFwMgAPSHqj6ffdGUpJsrLKKRNqA= X-Google-Smtp-Source: AGHT+IEZXRFduMWog8lY/WEBRyb3MZQs6kfaoxzTi2A/dpYZvd44wI5EVbBBu8fatXwqYTbLGqTaxw== X-Received: by 2002:a05:7022:6285:b0:11b:923d:774c with SMTP id a92af1059eb24-11c9d613979mr6980540c88.4.1763953067290; Sun, 23 Nov 2025 18:57:47 -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-11c93de82c1sm45441687c88.3.2025.11.23.18.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Nov 2025 18:57:47 -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 Subject: [PATCH V2 3/5] nvmet: ignore discard return value Date: Sun, 23 Nov 2025 18:57:35 -0800 Message-Id: <20251124025737.203571-4-ckulkarnilinux@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20251124025737.203571-1-ckulkarnilinux@gmail.com> References: <20251124025737.203571-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: 8bit __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. Signed-off-by: Chaitanya Kulkarni --- drivers/nvme/target/io-cmd-bdev.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c index 8d246b8ca604..97d868d6e01a 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; } -static u16 nvmet_bdev_discard_range(struct nvmet_req *req, - struct nvme_dsm_range *range, struct bio **bio) -{ - struct nvmet_ns *ns = req->ns; - int ret; - - ret = __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 != -EOPNOTSUPP) { - req->error_slba = 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 = req->ns; struct nvme_dsm_range range; struct bio *bio = NULL; + sector_t nr_sects; int i; - u16 status; + u16 status = NVME_SC_SUCCESS; for (i = 0; i <= le32_to_cpu(req->cmd->dsm.nr); i++) { status = nvmet_copy_from_sgl(req, i * sizeof(range), &range, @@ -392,9 +377,11 @@ static void nvmet_bdev_execute_discard(struct nvmet_req *req) if (status) break; - status = nvmet_bdev_discard_range(req, &range, &bio); - if (status) - break; + nr_sects = 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); } if (bio) { -- 2.40.0