diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-10-16 07:58:32 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-01 18:59:38 +0100 |
| commit | 71bd150c71072014d98bff6dc2db3229306ece35 (patch) | |
| tree | 83984e0181b01e79f05d1a1b09ffec31653e6394 /drivers/nvme | |
| parent | blk-mq: add a flags parameter to blk_mq_alloc_request (diff) | |
| download | linux-71bd150c71072014d98bff6dc2db3229306ece35.tar.xz linux-71bd150c71072014d98bff6dc2db3229306ece35.zip | |
nvme: move struct nvme_iod to pci.c
This structure is specific to the PCIe driver internals and should be moved
to pci.c.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 17 | ||||
| -rw-r--r-- | drivers/nvme/host/pci.c | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index fdb4e5bad9ac..2cead2c98163 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -94,23 +94,6 @@ struct nvme_ns { u32 mode_select_block_len; }; -/* - * The nvme_iod describes the data in an I/O, including the list of PRP - * entries. You can't see it in this data structure because C doesn't let - * me express that. Use nvme_alloc_iod to ensure there's enough space - * allocated to store the PRP list. - */ -struct nvme_iod { - unsigned long private; /* For the use of the submitter of the I/O */ - int npages; /* In the PRP list. 0 means small pool in use */ - int offset; /* Of PRP list */ - int nents; /* Used in scatterlist */ - int length; /* Of data, in bytes */ - dma_addr_t first_dma; - struct scatterlist meta_sg[1]; /* metadata requires single contiguous buffer */ - struct scatterlist sg[0]; -}; - static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector) { return (sector >> (ns->lba_shift - 9)); diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index b8a02221233c..0f24d3c531c0 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -130,6 +130,23 @@ struct nvme_queue { }; /* + * The nvme_iod describes the data in an I/O, including the list of PRP + * entries. You can't see it in this data structure because C doesn't let + * me express that. Use nvme_alloc_iod to ensure there's enough space + * allocated to store the PRP list. + */ +struct nvme_iod { + unsigned long private; /* For the use of the submitter of the I/O */ + int npages; /* In the PRP list. 0 means small pool in use */ + int offset; /* Of PRP list */ + int nents; /* Used in scatterlist */ + int length; /* Of data, in bytes */ + dma_addr_t first_dma; + struct scatterlist meta_sg[1]; /* metadata requires single contiguous buffer */ + struct scatterlist sg[0]; +}; + +/* * Check we didin't inadvertently grow the command struct */ static inline void _nvme_check_size(void) |