From patchwork Tue Sep 15 14:11:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 263926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7785AC433E2 for ; Tue, 15 Sep 2020 23:35:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D32F206E6 for ; Tue, 15 Sep 2020 23:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600212946; bh=f17enNH3l8GhW1DjaXkY/8QBfmSKH+/OaPdvEdBb4Nc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iKD3RyuH1jeb3C8kLE7no88zvL83/CPrGI1V7FCfjm6sil8+ZK3GB4I8qtMX0RqXx 3PbfYXVgp2Z3aC7aXU84bjR6sBeuPFeL0Hv2WgvPIsnSoUDQw3OiKyHwL/+0CB/m4i RUD9DFSoeOOjeiBeeXvX98EwCbVVNaxLSIOKtp0Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727494AbgIOXfY (ORCPT ); Tue, 15 Sep 2020 19:35:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:48014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727143AbgIOOfY (ORCPT ); Tue, 15 Sep 2020 10:35:24 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 65E7A22241; Tue, 15 Sep 2020 14:25:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179949; bh=f17enNH3l8GhW1DjaXkY/8QBfmSKH+/OaPdvEdBb4Nc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i9pKa/ZacY1jC9h42LWm3MYq76vzBO4SKcps1y7tjgJ4Dx7eTaxSa5d/tU63z7RsW lmPrbkVgT1nrq9Z7FO4z1mnryEJ0RSHApKQgvZHAJO4GLJdlZ6WykrhXaohkWCpxz8 vYBdOG4KrL44EmSQvznvb3VuxUrbUnZzin3S4r8M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Christoph Hellwig , Jens Axboe , Sasha Levin Subject: [PATCH 5.8 048/177] block: restore a specific error code in bdev_del_partition Date: Tue, 15 Sep 2020 16:11:59 +0200 Message-Id: <20200915140655.927381074@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140653.610388773@linuxfoundation.org> References: <20200915140653.610388773@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christoph Hellwig [ Upstream commit 88ce2a530cc9865a894454b2e40eba5957a60e1a ] mdadm relies on the fact that deleting an invalid partition returns -ENXIO or -ENOTTY to detect if a block device is a partition or a whole device. Fixes: 08fc1ab6d748 ("block: fix locking in bdev_del_partition") Reported-by: kernel test robot Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/partitions/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/partitions/core.c b/block/partitions/core.c index 534e11285a8d4..b45539764c994 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -529,7 +529,7 @@ int bdev_del_partition(struct block_device *bdev, int partno) bdevp = bdget_disk(bdev->bd_disk, partno); if (!bdevp) - return -ENOMEM; + return -ENXIO; mutex_lock(&bdevp->bd_mutex); mutex_lock_nested(&bdev->bd_mutex, 1);