From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Date: Mon, 21 Sep 2020 11:45:46 +0300 Subject: [Ocfs2-devel] [PATCH 08/14] dasd: cleanup dasd_scan_partitions In-Reply-To: <20200921071958.307589-9-hch@lst.de> References: <20200921071958.307589-1-hch@lst.de> <20200921071958.307589-9-hch@lst.de> Message-ID: <28f7f012-2787-2959-394e-cda480786ea9@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christoph Hellwig , 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 Hello! On 21.09.2020 10:19, Christoph Hellwig wrote: > Use blkdev_get_by_dev instead of bdget_disk + blkdev_get. > > Signed-off-by: Christoph Hellwig > --- > drivers/s390/block/dasd_genhd.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c > index af5b0ecb8f8923..a9698fba9b76ce 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); > + "scan partitions error, blkdev_get returned %ld", blkdev_get_by_dev() now? > + PTR_ERR(bdev)); > return -ENODEV; > } > MBR, Sergei