diff options
| author | Keith Busch | 2014-08-29 17:06:12 +0200 |
|---|---|---|
| committer | Jens Axboe | 2014-11-04 21:17:09 +0100 |
| commit | b4ff9c8ddb6f0cec99a53ab26a5aa2ed0162c472 (patch) | |
| tree | f5852bde4a98c4acb718ec9ddab8f56e51343c94 /drivers/block/nvme-core.c | |
| parent | NVMe: Fix SG_IO status values (diff) | |
| download | kernel-qcow2-linux-b4ff9c8ddb6f0cec99a53ab26a5aa2ed0162c472.tar.gz kernel-qcow2-linux-b4ff9c8ddb6f0cec99a53ab26a5aa2ed0162c472.tar.xz kernel-qcow2-linux-b4ff9c8ddb6f0cec99a53ab26a5aa2ed0162c472.zip | |
NVMe: Translate NVMe status to errno
This returns a more appropriate error for the "capacity exceeded"
status. In case other NVMe statuses have a better errno, this patch adds
a convience function to translate an NVMe status code to an errno for
IO commands, defaulting to the current -EIO.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/nvme-core.c')
| -rw-r--r-- | drivers/block/nvme-core.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 37f22b6bb009..3153692da288 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -450,6 +450,18 @@ static void nvme_end_io_acct(struct bio *bio, unsigned long start_time) } } +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; + } +} + static void bio_completion(struct nvme_queue *nvmeq, void *ctx, struct nvme_completion *cqe) { @@ -469,7 +481,7 @@ static void bio_completion(struct nvme_queue *nvmeq, void *ctx, wake_up(&nvmeq->sq_full); return; } - error = -EIO; + error = nvme_error_status(status); } if (iod->nents) { dma_unmap_sg(nvmeq->q_dmadev, iod->sg, iod->nents, |