Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp575894pxk; Thu, 17 Sep 2020 10:20:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytXgIj+VcQloMu1Wd5PJKZ9TwZYFi8bReR4uVVOyZoYZdEkut3UaMU3rOitl/td1iYVLZR X-Received: by 2002:a17:906:22c1:: with SMTP id q1mr30755460eja.529.1600363206254; Thu, 17 Sep 2020 10:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600363206; cv=none; d=google.com; s=arc-20160816; b=XR5cnA9IqY3O7nBO5SP0I7p564T/285wwYt9EIsPJdnd60CEHOkxANIhI2zm/BD5+g JzEttYUP6mvPee6UWeAdBW98BkIzPBUYc3Vhb8Tz/zOzf9KMToqj6smRuYcSUCPuR7K2 dTDrZC7C31hAZSlAPHijMqdnuX9zbpLjN9F/7Ymckj44SGIQPBBwTV508/40wy23BeOY H4myhlTQMpIpxIaIXPa5Jg/3y9LdAoYXD6ksw3q6jricPM3d5DqyZozIWT5vC5Kx/rOy sKT346b25CGGVE5h0KV+Aszi3o5xVYJoQJS5eV0DdE+E60ljkJt6ZUUOohy5IkMA+itQ FVzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j5g5OgRmz0IwlHnZdVk12MTLugeRmwRtfydhYqXW3VA=; b=hVYGua8F2vvmct2/BAY0Nt75ta0IhRx3jnFGmBoPY9MFmUwFWTNuLvxeJyBp6UZfNo 0AGu2miC9w87yLrhn6uOoWHLOKvBw1SKL9Amtn6ggH544CDtQ/Amw8Mzr/QfrcJ6yUCv TCZ/0FKEe+CpoRoNEgwAid6HWfGO4r15019Vz5qGHo/jWY3d2Oca348eOXU1astKFPZZ Yz2EV71mzBSYtdA4SLgiaMhyw3KDLbDYH23xz1TdROxyJz0TrLQKpfkBd+IMclO1hdlf O9ET5Kvbn9sODTXwAMjkPFa7YwCxwvHbLmaweu4eN/DPIJi0y8I4tHQ1qIdk/0F/SGsM 5qyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=h46BUJEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ch15si475642ejb.52.2020.09.17.10.19.42; Thu, 17 Sep 2020 10:20:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=h46BUJEB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726471AbgIQRSg (ORCPT + 99 others); Thu, 17 Sep 2020 13:18:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726599AbgIQRSG (ORCPT ); Thu, 17 Sep 2020 13:18:06 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC46AC061756; Thu, 17 Sep 2020 10:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=j5g5OgRmz0IwlHnZdVk12MTLugeRmwRtfydhYqXW3VA=; b=h46BUJEBNfEy360lDk+R/ak9Py dK++bBMUBX6+Ji16EILbRg6rFJZDzJBKfEjYpp1+29cOwo4Nj0g1llqFP5h+d+zfz1NZNeEgI+WDa kVVoajEn577WNKybCXKmBBuj0UJGA/k3G4YyeOP3tmIvYI2eM7+5fLN44sNK49wyDZoZ/wd7e5EcH c1xpIODHcW4jCmq6aWQdYW7cZ8IZfHdyLE1Fx9keTpS9OU9G+E0ULmcbmvJaa2dqOaZwREVh9l/AX z7fQsLe8kWVGNXXfdvaPMz8BDDwkHDz9hh2k3ciSlJq9AuP3Klq1IE3q+zgPD3YyJyE9zPgP2P7yO qq8iikFQ==; Received: from 089144214092.atnat0023.highway.a1.net ([89.144.214.92] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIxWn-0001ev-Dz; Thu, 17 Sep 2020 17:17:01 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Josef Bacik , Minchan Kim , Stefan Haberland , Jan Hoeppner , Joseph Qi , "Rafael J. Wysocki" , Pavel Machek , Len Brown , Andrew Morton , linux-kernel@vger.kernel.org, nbd@other.debian.org, linux-ide@vger.kernel.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com, linux-pm@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org Subject: [PATCH 08/14] dasd: cleanup dasd_scan_partitions Date: Thu, 17 Sep 2020 18:57:14 +0200 Message-Id: <20200917165720.3285256-9-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200917165720.3285256-1-hch@lst.de> References: <20200917165720.3285256-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use blkdev_get_by_dev instead of bdget_disk + blkdev_get. Signed-off-by: Christoph Hellwig --- drivers/s390/block/dasd_genhd.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index af5b0ecb8f8923..70c09a46d22806 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -101,18 +101,11 @@ int dasd_scan_partitions(struct dasd_block *block) struct block_device *bdev; int rc; - bdev = bdget_disk(block->gdp, 0); - if (!bdev) { - DBF_DEV_EVENT(DBF_ERR, block->base, "%s", - "scan partitions error, bdget returned NULL"); - return -ENODEV; - } - - rc = blkdev_get(bdev, FMODE_READ, NULL); - if (rc < 0) { + bdev = blkdev_get_by_dev(disk_devt(block->gdp), FMODE_READ, NULL); + if (IS_ERR(bdev)) { DBF_DEV_EVENT(DBF_ERR, block->base, "scan partitions error, blkdev_get returned %d", - rc); + IS_ERR(bdev)); return -ENODEV; } -- 2.28.0