Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935827AbcJQQgE (ORCPT ); Mon, 17 Oct 2016 12:36:04 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34332 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753285AbcJQQf4 (ORCPT ); Mon, 17 Oct 2016 12:35:56 -0400 From: Wei Yongjun To: Dan Williams Cc: Wei Yongjun , linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org Subject: [PATCH -next] libnvdimm: fix error return code in __blk_label_update() Date: Mon, 17 Oct 2016 16:35:48 +0000 Message-Id: <1476722148-22795-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 868 Lines: 26 From: Wei Yongjun Fix to return error code -ENXIO from the nd_label_alloc_slot() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun --- drivers/nvdimm/label.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c index fac7cab..ab2927c 100644 --- a/drivers/nvdimm/label.c +++ b/drivers/nvdimm/label.c @@ -710,8 +710,10 @@ static int __blk_label_update(struct nd_region *nd_region, if (is_old_resource(res, old_res_list, old_num_resources)) continue; /* carry-over */ slot = nd_label_alloc_slot(ndd); - if (slot == UINT_MAX) + if (slot == UINT_MAX) { + rc = -ENXIO; goto abort; + } dev_dbg(ndd->dev, "%s: allocated: %d\n", __func__, slot); nd_label = nd_label_base(ndd) + slot;