From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466AbdEFLMb (ORCPT ); Sat, 6 May 2017 07:12:31 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36514 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752025AbdEFLM0 (ORCPT ); Sat, 6 May 2017 07:12:26 -0400 From: Dinesh K B To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dinesh K B , Sudip Mukherjee , Jens Axboe Subject: [PATCH for stable branch 3.16.y] block: fix wrong error return in elevator_init() Date: Sat, 6 May 2017 16:41:56 +0530 Message-Id: <1494069116-3593-1-git-send-email-dineshkumarb@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.y review patch. Please let me know if anybody has objections. ----------------------------------------------------------------------- commit d32f6b57523b6e9b2e39e990e056f9882a6f099a From: Sudip Mukherjee Date: Thu, 23 Oct 2014 22:16:48 +0530 Subject: block: fix wrong error return in elevator_init() while compiling integer err was showing as a set but unused variable. elevator_init_fn can be either cfq_init_queue or deadline_init_queue or noop_init_queue. all three of these functions are returning -ENOMEM if they fail to allocate the queue. so we should actually be returning the error code rather than returning 0 always. Signed-off-by: Sudip Mukherjee Signed-off-by: Jens Axboe Backported to 3.16.y as is. Signed-off-by: Dinesh K B --- block/elevator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/elevator.c b/block/elevator.c index 24c28b6..afa3b03 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -229,7 +229,9 @@ int elevator_init(struct request_queue *q, char *name) } err = e->ops.elevator_init_fn(q, e); - return 0; + if (err) + elevator_put(e); + return err; } EXPORT_SYMBOL(elevator_init); -- 2.7.4