* Re: [PATCH] block:Change the function,nvme_alloc_queue to use -ENOMEM for when failing memory allocations
[not found] <1431474691-30469-1-git-send-email-xerofoify@gmail.com>
@ 2015-05-13 13:32 ` Matthew Wilcox
2015-05-13 14:12 ` [PATCH] block:Change the function, nvme_alloc_queue " Keith Busch
1 sibling, 0 replies; 2+ messages in thread
From: Matthew Wilcox @ 2015-05-13 13:32 UTC (permalink / raw)
To: Nicholas Krause; +Cc: linux-nvme, linux-kernel
On Tue, May 12, 2015 at 07:51:31PM -0400, Nicholas Krause wrote:
> This changes the function,nvme_alloc_queue to use the kernel code,
> -ENOMEM for when failing to allocate the memory required for the
> nvme_queue structure pointer,nvme in order to correctly return
> to the caller the correct reason for this function's failing.
> if (!nvmeq)
> - return NULL;
> + return -ENOMEM;
>
You didn't even compile-test this, did you?
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] block:Change the function, nvme_alloc_queue to use -ENOMEM for when failing memory allocations
[not found] <1431474691-30469-1-git-send-email-xerofoify@gmail.com>
2015-05-13 13:32 ` [PATCH] block:Change the function,nvme_alloc_queue to use -ENOMEM for when failing memory allocations Matthew Wilcox
@ 2015-05-13 14:12 ` Keith Busch
1 sibling, 0 replies; 2+ messages in thread
From: Keith Busch @ 2015-05-13 14:12 UTC (permalink / raw)
To: Nicholas Krause; +Cc: willy, linux-kernel, linux-nvme
On Tue, 12 May 2015, Nicholas Krause wrote:
> This changes the function,nvme_alloc_queue to use the kernel code,
> -ENOMEM for when failing to allocate the memory required for the
> nvme_queue structure pointer,nvme in order to correctly return
> to the caller the correct reason for this function's failing.
Nak! Look at what the callers are checking for upon return.
> Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
> ---
> drivers/block/nvme-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index 85b8036..e2eac1e 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -1387,7 +1387,7 @@ static struct nvme_queue *nvme_alloc_queue(struct nvme_dev *dev, int qid,
> struct device *dmadev = &dev->pci_dev->dev;
> struct nvme_queue *nvmeq = kzalloc(sizeof(*nvmeq), GFP_KERNEL);
> if (!nvmeq)
> - return NULL;
> + return -ENOMEM;
>
> nvmeq->cqes = dma_zalloc_coherent(dmadev, CQ_SIZE(depth),
> &nvmeq->cq_dma_addr, GFP_KERNEL);
^ permalink raw reply [flat|nested] 2+ messages in thread