Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71bd150c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6f3b0e8b

drivers/nvme/host/nvme.h

+0 −17
Original line number Diff line number Diff line
@@ -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));

drivers/nvme/host/pci.c

+17 −0
Original line number Diff line number Diff line
@@ -129,6 +129,23 @@ struct nvme_queue { 
	struct async_cmd_info cmdinfo;

};



/*

 * 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

 */