From patchwork Tue Apr 5 12:59:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artur Paszkiewicz X-Patchwork-Id: 8751381 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0501CC0553 for ; Tue, 5 Apr 2016 13:00:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EE5B20390 for ; Tue, 5 Apr 2016 12:59:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 273F02038F for ; Tue, 5 Apr 2016 12:59:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758054AbcDEM75 (ORCPT ); Tue, 5 Apr 2016 08:59:57 -0400 Received: from mga14.intel.com ([192.55.52.115]:24779 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752363AbcDEM74 (ORCPT ); Tue, 5 Apr 2016 08:59:56 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 05 Apr 2016 05:59:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,444,1455004800"; d="scan'208";a="938647770" Received: from apaszkie-desk.igk.intel.com (HELO apaszkie-desk.ger.corp.intel.com) ([10.102.11.38]) by fmsmga001.fm.intel.com with ESMTP; 05 Apr 2016 05:59:54 -0700 From: Artur Paszkiewicz To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, vishal.l.verma@intel.com, linux-raid@vger.kernel.org, Artur Paszkiewicz Subject: [PATCH] badblocks: fix wrong return value when badblocks are disabled Date: Tue, 5 Apr 2016 14:59:34 +0200 Message-Id: <1459861174-9238-1-git-send-email-artur.paszkiewicz@intel.com> X-Mailer: git-send-email 2.6.2 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The return value of md_set_badblocks() was inverted when the code was taken out of md, but the case when badblocks are disabled was left unchanged. This causes silent ignoring of I/O errors and other unpredictable behavior on md arrays that do not support badblocks (any array not using v1.x metadata). Fixes: 9e0e252a048b ("badblocks: Add core badblock management code") Signed-off-by: Artur Paszkiewicz Acked-by: Vishal Verma Reviewed-by: Johannes Thumshirn --- block/badblocks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/badblocks.c b/block/badblocks.c index 7be53cb..252f24e 100644 --- a/block/badblocks.c +++ b/block/badblocks.c @@ -147,6 +147,7 @@ EXPORT_SYMBOL_GPL(badblocks_check); * Return: * 0: success * 1: failed to set badblocks (out of space) + * -1: failed to set badblocks (badblocks are disabled) */ int badblocks_set(struct badblocks *bb, sector_t s, int sectors, int acknowledged) @@ -158,7 +159,7 @@ int badblocks_set(struct badblocks *bb, sector_t s, int sectors, if (bb->shift < 0) /* badblocks are disabled */ - return 0; + return -1; if (bb->shift) { /* round the start down, and the end up */