On 11/24/2015 11:34 AM, Sudip Mukherjee wrote:
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 <[email protected]>
---
  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;

Thanks. Wenwei Tao already sent a fix for this.

You can see the latest patches queued for upstream at:

  https://github.com/OpenChannelSSD/linux/commits/for-next

(remember to switch to the for-next branch in the qemu-nvme repo if you're testing with qemu).
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to