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

Commit 15a190f7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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

drivers/nvme/host/nvme.h

+12 −0
Original line number Diff line number Diff line
@@ -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,

drivers/nvme/host/pci.c

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

{