OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nvme: don't pass struct nvme_ns to nvme_init_integrity 

To allow reusing this function for the multipath node.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2017-11-02 21:28:53 +03:00 committed by Jens Axboe
parent b5be3b3929
commit 39b7baa410
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/nvme/host/core.c
View File

@ -1081,12 +1081,12 @@ static int nvme_getgeo(struct block_device *bdev, struct hd_geometry *geo)
} }
#ifdef CONFIG_BLK_DEV_INTEGRITY #ifdef CONFIG_BLK_DEV_INTEGRITY
static void nvme_init_integrity(struct nvme_ns *ns) static void nvme_init_integrity(struct gendisk *disk, u16 ms, u8 pi_type)
{ {
struct blk_integrity integrity; struct blk_integrity integrity;
memset(&integrity, 0, sizeof(integrity)); memset(&integrity, 0, sizeof(integrity));
switch (ns->pi_type) { switch (pi_type) {
case NVME_NS_DPS_PI_TYPE3: case NVME_NS_DPS_PI_TYPE3:
integrity.profile = &t10_pi_type3_crc; integrity.profile = &t10_pi_type3_crc;
integrity.tag_size = sizeof(u16) + sizeof(u32); integrity.tag_size = sizeof(u16) + sizeof(u32);
@ -1102,12 +1102,12 @@ static void nvme_init_integrity(struct nvme_ns *ns)
integrity.profile = NULL; integrity.profile = NULL;
break; break;
} }
integrity.tuple_size = ns->ms; integrity.tuple_size = ms;
blk_integrity_register(ns->disk, &integrity); blk_integrity_register(disk, &integrity);
blk_queue_max_integrity_segments(ns->queue, 1); blk_queue_max_integrity_segments(disk->queue, 1);
} }
#else #else
static void nvme_init_integrity(struct nvme_ns *ns) static void nvme_init_integrity(struct gendisk *disk, u16 ms, u8 pi_type)
{ {
} }
#endif /* CONFIG_BLK_DEV_INTEGRITY */ #endif /* CONFIG_BLK_DEV_INTEGRITY */
@ -1191,7 +1191,7 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
nvme_set_chunk_size(ns); nvme_set_chunk_size(ns);
if (ns->ms && !ns->ext && if (ns->ms && !ns->ext &&
(ctrl->ops->flags & NVME_F_METADATA_SUPPORTED)) (ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
nvme_init_integrity(ns); nvme_init_integrity(disk, ns->ms, ns->pi_type);
if (ns->ms && !(ns->ms == 8 && ns->pi_type) && !blk_get_integrity(disk)) if (ns->ms && !(ns->ms == 8 && ns->pi_type) && !blk_get_integrity(disk))
set_capacity(disk, 0); set_capacity(disk, 0);
else else