From: Christoph Hellwig <hch@lst.de>
To: linux-nvme@lists.infradead.org
Cc: Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@kernel.dk>,
Damien Le Moal <Damien.LeMoal@wdc.com>,
Sagi Grimberg <sagi@grimberg.me>
Subject: [PATCH 05/20] nvme: rename _nvme_revalidate_disk
Date: Mon, 28 Sep 2020 14:34:47 +0200 [thread overview]
Message-ID: <20200928123502.435373-6-hch@lst.de> (raw)
In-Reply-To: <20200928123502.435373-1-hch@lst.de>
Rename _nvme_revalidate_disk to nvme_validate_ns to better describe
what the function does, and pass the struct nvme_ns instead of the
gendisk to better match the call chain.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/nvme/host/core.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c5f2615bf58374..c04043a94e6496 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -89,7 +89,7 @@ static dev_t nvme_chr_devt;
static struct class *nvme_class;
static struct class *nvme_subsys_class;
-static int _nvme_revalidate_disk(struct gendisk *disk);
+static int nvme_validate_ns(struct nvme_ns *ns);
static void nvme_put_subsystem(struct nvme_subsystem *subsys);
static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
unsigned nsid);
@@ -1026,7 +1026,7 @@ static void nvme_update_formats(struct nvme_ctrl *ctrl, u32 *effects)
down_read(&ctrl->namespaces_rwsem);
list_for_each_entry(ns, &ctrl->namespaces, list)
- if (_nvme_revalidate_disk(ns->disk))
+ if (nvme_validate_ns(ns))
nvme_set_queue_dying(ns);
else if (blk_queue_is_zoned(ns->disk->queue)) {
/*
@@ -2154,16 +2154,15 @@ static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
return 0;
}
-static int _nvme_revalidate_disk(struct gendisk *disk)
+static int nvme_validate_ns(struct nvme_ns *ns)
{
- struct nvme_ns *ns = disk->private_data;
struct nvme_ctrl *ctrl = ns->ctrl;
struct nvme_id_ns *id;
struct nvme_ns_ids ids;
int ret = 0;
if (test_bit(NVME_NS_DEAD, &ns->flags)) {
- set_capacity(disk, 0);
+ set_capacity(ns->disk, 0);
return -ENODEV;
}
@@ -2187,7 +2186,7 @@ static int _nvme_revalidate_disk(struct gendisk *disk)
goto free_id;
}
- ret = __nvme_revalidate_disk(disk, id);
+ ret = __nvme_revalidate_disk(ns->disk, id);
free_id:
kfree(id);
out:
@@ -4032,7 +4031,7 @@ static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
return;
}
- ret = _nvme_revalidate_disk(ns->disk);
+ ret = nvme_validate_ns(ns);
if (!ret && blk_queue_is_zoned(ns->queue))
ret = nvme_revalidate_zones(ns);
revalidate_disk_size(ns->disk, ret == 0);
--
2.28.0
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-09-28 12:35 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 12:34 refactor the nvme scanning and validation code Christoph Hellwig
2020-09-28 12:34 ` [PATCH 01/20] block: optimize blk_queue_zoned_model for !CONFIG_BLK_DEV_ZONED Christoph Hellwig
2020-09-28 14:11 ` Damien Le Moal
2020-09-29 8:29 ` Sagi Grimberg
2020-09-29 18:25 ` Christoph Hellwig
2020-09-29 21:12 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 02/20] nvme: fix initialization of the zone bitmaps Christoph Hellwig
2020-09-28 14:13 ` Damien Le Moal
2020-09-28 14:16 ` Damien Le Moal
2020-09-28 14:26 ` Christoph Hellwig
2020-09-29 21:27 ` Keith Busch
2020-09-28 12:34 ` [PATCH 03/20] nvme: remove the disk argument to nvme_update_zone_info Christoph Hellwig
2020-09-28 14:17 ` Damien Le Moal
2020-09-29 8:32 ` Sagi Grimberg
2020-09-29 21:15 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 04/20] nvme: rename nvme_validate_ns to nvme_validate_or_alloc_ns Christoph Hellwig
2020-09-28 14:19 ` Damien Le Moal
2020-09-29 8:33 ` Sagi Grimberg
2020-09-29 21:17 ` Chaitanya Kulkarni
2020-09-28 12:34 ` Christoph Hellwig [this message]
2020-09-28 14:20 ` [PATCH 05/20] nvme: rename _nvme_revalidate_disk Damien Le Moal
2020-09-29 8:34 ` Sagi Grimberg
2020-09-29 21:18 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 06/20] nvme: rename __nvme_revalidate_disk Christoph Hellwig
2020-09-28 14:21 ` Damien Le Moal
2020-09-29 8:35 ` Sagi Grimberg
2020-09-29 21:20 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 07/20] nvme: lift the check for an unallocated namespace into nvme_identify_ns Christoph Hellwig
2020-09-28 14:27 ` Damien Le Moal
2020-09-29 18:29 ` Christoph Hellwig
2020-09-29 8:36 ` Sagi Grimberg
2020-09-29 21:22 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 08/20] nvme: call nvme_identify_ns as the first thing in nvme_alloc_ns_block Christoph Hellwig
2020-09-28 14:32 ` Damien Le Moal
2020-09-29 8:39 ` Sagi Grimberg
2020-09-29 18:30 ` Christoph Hellwig
2020-09-29 21:24 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 09/20] nvme: factor out a nvme_configure_metadata helper Christoph Hellwig
2020-09-28 14:35 ` Damien Le Moal
2020-09-29 8:40 ` Sagi Grimberg
2020-09-29 21:27 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 10/20] nvme: freeze the queue over ->lba_shift updates Christoph Hellwig
2020-09-28 14:49 ` Damien Le Moal
2020-09-29 8:48 ` Sagi Grimberg
2020-09-29 18:32 ` Christoph Hellwig
2020-09-29 19:07 ` Sagi Grimberg
2020-10-02 16:03 ` Sagi Grimberg
2020-10-05 8:32 ` Christoph Hellwig
2020-09-28 12:34 ` [PATCH 11/20] nvme: clean up the check for too large logic block sizes Christoph Hellwig
2020-09-28 14:50 ` Damien Le Moal
2020-09-29 18:33 ` Christoph Hellwig
2020-09-29 8:50 ` Sagi Grimberg
2020-09-29 18:34 ` Christoph Hellwig
2020-09-28 12:34 ` [PATCH 12/20] nvme: remove the 0 lba_shift check in nvme_update_ns_info Christoph Hellwig
2020-09-28 14:51 ` Damien Le Moal
2020-09-29 8:52 ` Sagi Grimberg
2020-09-29 18:34 ` Christoph Hellwig
2020-09-29 21:46 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 13/20] nvme: set the queue limits " Christoph Hellwig
2020-09-28 14:55 ` Damien Le Moal
2020-09-29 8:54 ` Sagi Grimberg
2020-09-29 21:52 ` Chaitanya Kulkarni
2020-09-30 6:12 ` Christoph Hellwig
2020-09-28 12:34 ` [PATCH 14/20] nvme: update the known admin effects Christoph Hellwig
2020-09-28 14:57 ` Damien Le Moal
2020-09-29 8:55 ` Sagi Grimberg
2020-09-29 21:54 ` Chaitanya Kulkarni
2020-09-28 12:34 ` [PATCH 15/20] nvme: remove nvme_update_formats Christoph Hellwig
2020-09-28 15:02 ` Damien Le Moal
2020-09-28 12:34 ` [PATCH 16/20] nvme: revalidate zone bitmaps in nvme_update_ns_info Christoph Hellwig
2020-09-28 15:06 ` Damien Le Moal
2020-09-29 18:37 ` Christoph Hellwig
2020-09-28 12:34 ` [PATCH 17/20] nvme: query namespae identifiers before adding the namespace Christoph Hellwig
2020-09-28 15:11 ` Damien Le Moal
2020-09-30 9:44 ` Niklas Cassel
2020-09-30 10:04 ` Niklas Cassel
2020-10-01 17:14 ` Christoph Hellwig
2020-10-01 17:43 ` Niklas Cassel
2020-10-02 6:41 ` Christoph Hellwig
2020-09-28 12:35 ` [PATCH 18/20] nvme: move nvme_validate_ns Christoph Hellwig
2020-09-28 15:12 ` Damien Le Moal
2020-09-30 0:22 ` Chaitanya Kulkarni
2020-09-30 6:13 ` Christoph Hellwig
2020-09-28 12:35 ` [PATCH 19/20] nvme: refactor nvme_validate_ns Christoph Hellwig
2020-09-28 15:15 ` Damien Le Moal
2020-09-29 18:40 ` Christoph Hellwig
2020-09-28 12:35 ` [PATCH 20/20] nvme: remove nvme_identify_ns_list Christoph Hellwig
2020-09-29 23:59 ` Chaitanya Kulkarni
2020-09-29 16:51 ` refactor the nvme scanning and validation code Keith Busch
2020-09-30 6:41 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928123502.435373-6-hch@lst.de \
--to=hch@lst.de \
--cc=Damien.LeMoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).