diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-10-16 07:58:39 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-01 18:59:39 +0100 |
| commit | 15a190f7f57a2e46717490c35ac09882042a200b (patch) | |
| tree | 9456260512e109891f81a05dc6426ce03287fe82 /drivers | |
| parent | nvme: factor out a nvme_unmap_data helper (diff) | |
| download | linux-15a190f7f57a2e46717490c35ac09882042a200b.tar.xz linux-15a190f7f57a2e46717490c35ac09882042a200b.zip | |
nvme: move nvme_error_status to common code
And mark it inline so that we don't slow down the completion path by
having to turn it into a forced out of line call.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/nvme.h | 12 | ||||
| -rw-r--r-- | drivers/nvme/host/pci.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 19583e1125e6..9f771265487b 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -85,6 +85,18 @@ static inline u64 nvme_block_nr(struct nvme_ns *ns, sector_t sector) return (sector >> (ns->lba_shift - 9)); } +static inline int nvme_error_status(u16 status) +{ + switch (status & 0x7ff) { + case NVME_SC_SUCCESS: + return 0; + case NVME_SC_CAP_EXCEEDED: + return -ENOSPC; + default: + return -EIO; + } +} + int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, void *buf, unsigned bufflen); int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 801d51d4ea10..d29d36d726b5 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -547,18 +547,6 @@ static void nvme_free_iod(struct nvme_dev *dev, struct nvme_iod *iod) kfree(iod); } -static int nvme_error_status(u16 status) -{ - switch (status & 0x7ff) { - case NVME_SC_SUCCESS: - return 0; - case NVME_SC_CAP_EXCEEDED: - return -ENOSPC; - default: - return -EIO; - } -} - #ifdef CONFIG_BLK_DEV_INTEGRITY static void nvme_dif_prep(u32 p, u32 v, struct t10_pi_tuple *pi) { |