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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 39221C63777 for ; Sat, 28 Nov 2020 16:22:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C6FA9246C3 for ; Sat, 28 Nov 2020 16:22:58 +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="DAxlSn96" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6FA9246C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5F1DD8D0006; Sat, 28 Nov 2020 11:22:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 57A678D0001; Sat, 28 Nov 2020 11:22:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 443818D0006; Sat, 28 Nov 2020 11:22:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0182.hostedemail.com [216.40.44.182]) by kanga.kvack.org (Postfix) with ESMTP id 2B9DF8D0001 for ; Sat, 28 Nov 2020 11:22:58 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id ECA61180AD82F for ; Sat, 28 Nov 2020 16:22:57 +0000 (UTC) X-FDA: 77534345994.24.park37_450667927392 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id C734D1A4A0 for ; Sat, 28 Nov 2020 16:22:57 +0000 (UTC) X-HE-Tag: park37_450667927392 X-Filterd-Recvd-Size: 6185 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Nov 2020 16:22:57 +0000 (UTC) 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=BBaHxk978MlWH1CCYOyHADwe4AyKWILnIzR+cKOSYog=; b=DAxlSn96EZCCIupgZ0dspi/RId RCY1mHqnuAInMyBxHg5nBBOB8OxCM9cyapc3rHhXbAofkzdjWnTAyO2VRwbYOy+6mN8moIojG4HBh NuPOIN5t4hxjUV7p0CgmiWQtmePE63HIXHnDc0mi1jzTltVu+NgQVNrUmK2m4WdDqHnvZDvpF+/TH 35wu856p/MqgA+jdfVAEM+9XBfwbRB0ZR5Cn9aUhRq7vKx93DbXy0nEwkS+RFKuaa2BuDOb1ZwIRk yKVdpa9oimDD255eq6aV8KMqSK35UMiJphIKOoGnqX4AP+eBnqVHVGAJ8mLjBAkHj6OhHdC8c/nrV tIh0rM8w==; Received: from 089144198196.atnat0007.highway.a1.net ([89.144.198.196] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kj2zl-0000sI-W1; Sat, 28 Nov 2020 16:22:46 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Coly Li , Mike Snitzer , Greg Kroah-Hartman , Jan Kara , Johannes Thumshirn , dm-devel@redhat.com, Jan Kara , linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 36/45] block: move the policy field to struct block_device Date: Sat, 28 Nov 2020 17:15:01 +0100 Message-Id: <20201128161510.347752-37-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201128161510.347752-1-hch@lst.de> References: <20201128161510.347752-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Move the policy field to struct block_device and rename it to the more descriptive bd_read_only. Also turn the field into a bool as it is used as such. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara --- block/blk-core.c | 2 +- block/genhd.c | 8 ++++---- block/ioctl.c | 2 +- block/partitions/core.c | 4 ++-- include/linux/blk_types.h | 1 + include/linux/genhd.h | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 9121390be97a76..d64ffcb6f9ae5d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -696,7 +696,7 @@ static inline bool bio_check_ro(struct bio *bio, stru= ct hd_struct *part) { const int op =3D bio_op(bio); =20 - if (part->policy && op_is_write(op)) { + if (part->bdev->bd_read_only && op_is_write(op)) { char b[BDEVNAME_SIZE]; =20 if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) diff --git a/block/genhd.c b/block/genhd.c index 0371558ccde14c..ae312ccc6dd7c0 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1679,14 +1679,14 @@ void set_disk_ro(struct gendisk *disk, int flag) struct disk_part_iter piter; struct hd_struct *part; =20 - if (disk->part0.policy !=3D flag) { + if (disk->part0.bdev->bd_read_only !=3D flag) { set_disk_ro_uevent(disk, flag); - disk->part0.policy =3D flag; + disk->part0.bdev->bd_read_only =3D flag; } =20 disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY); while ((part =3D disk_part_iter_next(&piter))) - part->policy =3D flag; + part->bdev->bd_read_only =3D flag; disk_part_iter_exit(&piter); } =20 @@ -1696,7 +1696,7 @@ int bdev_read_only(struct block_device *bdev) { if (!bdev) return 0; - return bdev->bd_part->policy; + return bdev->bd_read_only; } =20 EXPORT_SYMBOL(bdev_read_only); diff --git a/block/ioctl.c b/block/ioctl.c index a6d8171221c7dc..d61d652078f41c 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -345,7 +345,7 @@ static int blkdev_roset(struct block_device *bdev, fm= ode_t mode, if (ret) return ret; } - bdev->bd_part->policy =3D n; + bdev->bd_read_only =3D n; return 0; } =20 diff --git a/block/partitions/core.c b/block/partitions/core.c index c068471fa654f5..060c1be13cd8da 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -199,7 +199,7 @@ static ssize_t part_ro_show(struct device *dev, struct device_attribute *attr, char *buf) { struct hd_struct *p =3D dev_to_part(dev); - return sprintf(buf, "%d\n", p->policy ? 1 : 0); + return sprintf(buf, "%d\n", p->bdev->bd_read_only); } =20 static ssize_t part_alignment_offset_show(struct device *dev, @@ -420,7 +420,7 @@ static struct hd_struct *add_partition(struct gendisk= *disk, int partno, bdev->bd_start_sect =3D start; bdev_set_nr_sectors(bdev, len); p->partno =3D partno; - p->policy =3D get_disk_ro(disk); + bdev->bd_read_only =3D get_disk_ro(disk); =20 if (info) { err =3D -ENOMEM; diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index b237f1e4081405..758cf71c9aa2a6 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -23,6 +23,7 @@ struct block_device { sector_t bd_start_sect; struct disk_stats __percpu *bd_stats; unsigned long bd_stamp; + bool bd_read_only; /* read-only policy */ dev_t bd_dev; int bd_openers; struct inode * bd_inode; /* will die */ diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 349cf6403ccddc..dcbf9ef7610ea6 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -55,7 +55,7 @@ struct hd_struct { =20 struct block_device *bdev; struct device __dev; - int policy, partno; + int partno; struct rcu_work rcu_work; }; =20 @@ -278,7 +278,7 @@ extern void set_disk_ro(struct gendisk *disk, int fla= g); =20 static inline int get_disk_ro(struct gendisk *disk) { - return disk->part0.policy; + return disk->part0.bdev->bd_read_only; } =20 extern void disk_block_events(struct gendisk *disk); --=20 2.29.2