Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753774AbdIFK53 (ORCPT ); Wed, 6 Sep 2017 06:57:29 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:36982 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753277AbdIFKwl (ORCPT ); Wed, 6 Sep 2017 06:52:41 -0400 X-Google-Smtp-Source: ADKCNb6e0MPkIMiUTvBuwgJlhYQwXSN/G97DLkBSpsqkJg4viaX04xMgctko1EXvd2neyA+8m2EBmw== From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 04/18] lightnvm: pblk: check for failed mempool alloc. Date: Wed, 6 Sep 2017 12:50:57 +0200 Message-Id: <1504695071-25928-5-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504695071-25928-1-git-send-email-javier@cnexlabs.com> References: <1504695071-25928-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 886 Lines: 32 Check for failed mempool allocations and act accordingly. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index e3997abdf740..11a684162a5d 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c @@ -165,6 +165,8 @@ struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw) } rqd = mempool_alloc(pool, GFP_KERNEL); + if (!rqd) + return NULL; memset(rqd, 0, rq_size); return rqd; @@ -1478,6 +1480,8 @@ int pblk_blk_erase_async(struct pblk *pblk, struct ppa_addr ppa) int err; rqd = mempool_alloc(pblk->g_rq_pool, GFP_KERNEL); + if (!rqd) + return -ENOMEM; memset(rqd, 0, pblk_g_rq_size); pblk_setup_e_rq(pblk, rqd, ppa); -- 2.7.4