diff options
| author | Wei Yongjun | 2013-05-13 16:29:04 +0200 |
|---|---|---|
| committer | Matthew Wilcox | 2013-05-17 15:13:18 +0200 |
| commit | 1287dabd345f447bbe0f7a99fc95ab89bcfc0f5d (patch) | |
| tree | c28b898aa3296ab653403ae275f53151b66abb9f /drivers/block | |
| parent | NVMe: check for integer overflow in nvme_map_user_pages() (diff) | |
| download | kernel-qcow2-linux-1287dabd345f447bbe0f7a99fc95ab89bcfc0f5d.tar.gz kernel-qcow2-linux-1287dabd345f447bbe0f7a99fc95ab89bcfc0f5d.tar.xz kernel-qcow2-linux-1287dabd345f447bbe0f7a99fc95ab89bcfc0f5d.zip | |
NVMe: fix error return code in nvme_submit_bio_queue()
nvme_submit_flush_data() might overwrite the initialisation of the
return value with 0, so move the -ENOMEM setting close to the usage.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nvme-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 437637551d1e..d783f15e0fc5 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -629,7 +629,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, struct nvme_command *cmnd; struct nvme_iod *iod; enum dma_data_direction dma_dir; - int cmdid, length, result = -ENOMEM; + int cmdid, length, result; u16 control; u32 dsmgmt; int psegs = bio_phys_segments(ns->queue, bio); @@ -640,6 +640,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns, return result; } + result = -ENOMEM; iod = nvme_alloc_iod(psegs, bio->bi_size, GFP_ATOMIC); if (!iod) goto nomem; |