From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 BC21CC54FCC for ; Tue, 21 Apr 2020 06:12:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C93E2076C for ; Tue, 21 Apr 2020 06:12:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="hZKCofRi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726952AbgDUGMg (ORCPT ); Tue, 21 Apr 2020 02:12:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726801AbgDUGMe (ORCPT ); Tue, 21 Apr 2020 02:12:34 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1589C061A0F; Mon, 20 Apr 2020 23:12:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=AK5c0alQtqnh8utZ3Dc9H7NM0eA29BgaamyaZNrQbD4=; b=hZKCofRi4Jlvi/AhllyQkoXVdw 9+CUvAsPLu9onAwgEDgB0bdNhZi0yjzbBaGjULGlMaUz6xAM9hB0bFsboaBcHRMAy1xvmJqh5ZIVi fWTGDyoBTvI122P0Nt9SaCAUkTX8Ke9q798zQ8OE5smvPCjIXzciVCJqeic3ErV4r8+MRpqtrB7KH HCmd0nF2pCS9quQ3JDR0d3668HnSKN+aDQddOqPv61TCRciugWhdybLH2OegW03oQSvbgqaPxfb51 Uy99uYdO6gkgNQjTQjaT3QKPiLgYaJQ+gDuiHEalX0I+epITATT6w3BW2YxB1y0c5n4qYFTNf50G7 PAdjiszQ==; Received: from [2001:4bb8:191:e12c:292e:7dec:cf13:becd] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQm93-0000In-Lw; Tue, 21 Apr 2020 06:12:34 +0000 From: Christoph Hellwig To: Stefan Haberland , Jan Hoeppner , Jens Axboe , Heiko Carstens , Vasily Gorbik , Christian Borntraeger Cc: linux-s390@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] block: add a s390-only biodasdinfo method Date: Tue, 21 Apr 2020 08:12:25 +0200 Message-Id: <20200421061226.33731-3-hch@lst.de> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421061226.33731-1-hch@lst.de> References: <20200421061226.33731-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The IBM partition parser needs to query the DASD driver for details that are very s390 specific. Instead of using ioctl_by_bdev with a fake user space pointer just add a s390-specific method to get the information directly. Signed-off-by: Christoph Hellwig --- drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_int.h | 1 + drivers/s390/block/dasd_ioctl.c | 13 +++++++++++++ include/linux/blkdev.h | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index cf87eb27879f..26edd93167e7 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -3394,6 +3394,7 @@ dasd_device_operations = { .ioctl = dasd_ioctl, .compat_ioctl = dasd_ioctl, .getgeo = dasd_getgeo, + .biodasdinfo = dasd_biodasdinfo, }; /******************************************************************************* diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index fa552f9f1666..6eac7b11c75b 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h @@ -845,6 +845,7 @@ void dasd_destroy_partitions(struct dasd_block *); /* externals in dasd_ioctl.c */ int dasd_ioctl(struct block_device *, fmode_t, unsigned int, unsigned long); +int dasd_biodasdinfo(struct gendisk *disk, struct dasd_information2_t *info); /* externals in dasd_proc.c */ int dasd_proc_init(void); diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index dabcb4ce92da..332836d46ba0 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c @@ -666,3 +666,16 @@ int dasd_ioctl(struct block_device *bdev, fmode_t mode, dasd_put_device(base); return rc; } + +int dasd_biodasdinfo(struct gendisk *disk, struct dasd_information2_t *info) +{ + struct dasd_device *base; + int error; + + base = dasd_device_from_gendisk(disk); + if (!base) + return -ENODEV; + error = __dasd_ioctl_information(base->block, info); + dasd_put_device(base); + return error; +} diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 32868fbedc9e..3b92cc970083 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -43,6 +43,7 @@ struct pr_ops; struct rq_qos; struct blk_queue_stats; struct blk_stat_callback; +struct dasd_information2_t; #define BLKDEV_MIN_RQ 4 #define BLKDEV_MAX_RQ 128 /* Default maximum */ @@ -1700,6 +1701,10 @@ struct block_device_operations { int (*report_zones)(struct gendisk *, sector_t sector, unsigned int nr_zones, report_zones_cb cb, void *data); char *(*devnode)(struct gendisk *disk, umode_t *mode); +#ifdef CONFIG_S390 + int (*biodasdinfo)(struct gendisk *disk, + struct dasd_information2_t *info); +#endif struct module *owner; const struct pr_ops *pr_ops; }; -- 2.26.1