* Re: [PATCH -next] nvmet: fix error return code in nvmet_file_ns_enable()
2018-05-31 11:41 [PATCH -next] nvmet: fix error return code in nvmet_file_ns_enable() Wei Yongjun
@ 2018-05-31 11:36 ` Sagi Grimberg
2018-05-31 16:49 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Sagi Grimberg @ 2018-05-31 11:36 UTC (permalink / raw)
To: Wei Yongjun, Christoph Hellwig; +Cc: linux-nvme, linux-kernel, kernel-janitors
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH -next] nvmet: fix error return code in nvmet_file_ns_enable()
@ 2018-05-31 11:41 Wei Yongjun
2018-05-31 11:36 ` Sagi Grimberg
2018-05-31 16:49 ` Christoph Hellwig
0 siblings, 2 replies; 3+ messages in thread
From: Wei Yongjun @ 2018-05-31 11:41 UTC (permalink / raw)
To: Christoph Hellwig, Sagi Grimberg
Cc: Wei Yongjun, linux-nvme, linux-kernel, kernel-janitors
Fix to return error code -ENOMEM from the memory alloc fail error
handling case instead of 0, as done elsewhere in this function.
Fixes: d5eff33ee6f8 ("nvmet: add simple file backed ns support")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/nvme/target/io-cmd-file.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c
index ca1ccf8..e9d6ce4 100644
--- a/drivers/nvme/target/io-cmd-file.c
+++ b/drivers/nvme/target/io-cmd-file.c
@@ -49,14 +49,18 @@ int nvmet_file_ns_enable(struct nvmet_ns *ns)
ns->bvec_cache = kmem_cache_create("nvmet-bvec",
NVMET_MAX_MPOOL_BVEC * sizeof(struct bio_vec),
0, SLAB_HWCACHE_ALIGN, NULL);
- if (!ns->bvec_cache)
+ if (!ns->bvec_cache) {
+ ret = -ENOMEM;
goto err;
+ }
ns->bvec_pool = mempool_create(NVMET_MIN_MPOOL_OBJ, mempool_alloc_slab,
mempool_free_slab, ns->bvec_cache);
- if (!ns->bvec_pool)
+ if (!ns->bvec_pool) {
+ ret = -ENOMEM;
goto err;
+ }
return ret;
err:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] nvmet: fix error return code in nvmet_file_ns_enable()
2018-05-31 11:41 [PATCH -next] nvmet: fix error return code in nvmet_file_ns_enable() Wei Yongjun
2018-05-31 11:36 ` Sagi Grimberg
@ 2018-05-31 16:49 ` Christoph Hellwig
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2018-05-31 16:49 UTC (permalink / raw)
To: Wei Yongjun
Cc: Christoph Hellwig, Sagi Grimberg, linux-nvme, linux-kernel,
kernel-janitors
Thanks,
applied to nvme-4.18.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-31 16:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-31 11:41 [PATCH -next] nvmet: fix error return code in nvmet_file_ns_enable() Wei Yongjun
2018-05-31 11:36 ` Sagi Grimberg
2018-05-31 16:49 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).