Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320AbbKXKfP (ORCPT ); Tue, 24 Nov 2015 05:35:15 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:36104 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753571AbbKXKfK (ORCPT ); Tue, 24 Nov 2015 05:35:10 -0500 From: Sudip Mukherjee To: Matias Bjorling Cc: linux-kernel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH v2 2/5] lightnvm: check for max sector Date: Tue, 24 Nov 2015 16:04:57 +0530 Message-Id: <1448361300-26718-2-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448361300-26718-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1448361300-26718-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1531 Lines: 46 If max_phys_sect is greater than 256 then its obviously greater than 1 so we will never hit the else-if block. And moreover, if we check for max_phys_sect at the end then it might happen that we initialize successfully only to see at the end that this is not supported. Lets check for max_phys_sect at the beginning and continue initialization only if it is supported. Signed-off-by: Sudip Mukherjee --- drivers/lightnvm/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index e338048..2ab561f 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -296,6 +296,11 @@ int nvm_register(struct request_queue *q, char *disk_name, if (!ops->identity) return -EINVAL; + if (ops->max_phys_sect > 256) { + pr_info("nvm: max sectors supported is 256.\n"); + return -EINVAL; + } + dev = kzalloc(sizeof(struct nvm_dev), GFP_KERNEL); if (!dev) return -ENOMEM; @@ -319,9 +324,6 @@ int nvm_register(struct request_queue *q, char *disk_name, pr_err("nvm: could not create ppa pool\n"); return -ENOMEM; } - } else if (dev->ops->max_phys_sect > 256) { - pr_info("nvm: max sectors supported is 256.\n"); - return -EINVAL; } return 0; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/