mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
nvme: remove nvme_ns_config_oncs
Just opencode the two function calls in the caller. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Keith Busch <keith.busch@intel.com> Reviewed-by: Max Gurtovoy <maxg@mellanox.com> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Tested-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
7b210e4ed5
commit
b1aafb35b4
1 changed files with 3 additions and 7 deletions
|
@ -1552,12 +1552,6 @@ static inline void nvme_config_write_zeroes(struct nvme_ns *ns)
|
|||
blk_queue_max_write_zeroes_sectors(ns->queue, max_sectors);
|
||||
}
|
||||
|
||||
static inline void nvme_ns_config_oncs(struct nvme_ns *ns)
|
||||
{
|
||||
nvme_config_discard(ns);
|
||||
nvme_config_write_zeroes(ns);
|
||||
}
|
||||
|
||||
static void nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
|
||||
struct nvme_id_ns *id, struct nvme_ns_ids *ids)
|
||||
{
|
||||
|
@ -1611,7 +1605,9 @@ static void nvme_update_disk_info(struct gendisk *disk,
|
|||
capacity = 0;
|
||||
|
||||
set_capacity(disk, capacity);
|
||||
nvme_ns_config_oncs(ns);
|
||||
|
||||
nvme_config_discard(ns);
|
||||
nvme_config_write_zeroes(ns);
|
||||
|
||||
if (id->nsattr & (1 << 0))
|
||||
set_disk_ro(disk, true);
|
||||
|
|
Loading…
Reference in a new issue