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_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,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 BD2C3C64E75 for ; Wed, 18 Nov 2020 09:12:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3089B24656 for ; Wed, 18 Nov 2020 09:12:12 +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="MbUsQaP4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3089B24656 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 5E5186B008A; Wed, 18 Nov 2020 04:12:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 58C326B008C; Wed, 18 Nov 2020 04:12:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D1186B0092; Wed, 18 Nov 2020 04:12:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0100.hostedemail.com [216.40.44.100]) by kanga.kvack.org (Postfix) with ESMTP id 0F92B6B008A for ; Wed, 18 Nov 2020 04:12:09 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B5316181AEF23 for ; Wed, 18 Nov 2020 09:12:08 +0000 (UTC) X-FDA: 77496972336.03.hen31_5e002ed27339 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 9898328A4EA for ; Wed, 18 Nov 2020 09:12:08 +0000 (UTC) X-HE-Tag: hen31_5e002ed27339 X-Filterd-Recvd-Size: 5973 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf43.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Nov 2020 09:12:08 +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: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=rtXdmB6pB+D+QbtGbV+uHFq0yQJijYyGHbBI0cLjv2A=; b=MbUsQaP4K2SpOGVW5mv43oSYV6 aSTVb67wwO58YAjNvYMV+JptsTZETqgQ3iVNAbfWHCQ9HE5JT81DQ5LdbNLiSSXvHq/k7/yLci8zE BWakOahKmMr+FGf6UbLTbY5ACvNjirGAI+lCUyjSOA50PJSXlUcCDA0CuGKj7KT+rJUTyYFPsUGnT 6eRsMiIYjULW2kg2XeaXIAB0btu3VodTKNE1Pz44bT6gTmxgQcB687KguKJxiJBm9EAIUQxLSiLOJ rMJ8Ixv3mA08atwcPFG6zZ0vA+A8nlhq/s/JYSobbimDNkp47kt2AOxl+LkE9cWtZofajTO0QNTZm OmM7zM1Q==; Received: from [2001:4bb8:18c:31ba:32b1:ec66:5459:36a] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfJ8E-0007kG-NB; Wed, 18 Nov 2020 08:48:03 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Konrad Rzeszutek Wilk , Coly Li , Mike Snitzer , dm-devel@redhat.com, Richard Weinberger , Jan Kara , linux-block@vger.kernel.org, xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: merge struct block_device and struct hd_struct Date: Wed, 18 Nov 2020 09:47:40 +0100 Message-Id: <20201118084800.2339180-1-hch@lst.de> X-Mailer: git-send-email 2.29.2 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: Hi Jens, this series cleans up our main per-device node data structure by merging the block_device and hd_struct data structures that have the same scope, but different life times. The main effect (besides removing lots of code) is that instead of having two device sizes that need complex synchronization there is just one now. Note that it depends on the previous "misc cleanups" series. A git tree is available here: git://git.infradead.org/users/hch/block.git bdev-lookup Gitweb: http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/bdev= -lookup Diffstat: block/bio.c | 6=20 block/blk-cgroup.c | 50 +- block/blk-core.c | 85 +-- block/blk-flush.c | 2=20 block/blk-iocost.c | 36 - block/blk-lib.c | 2=20 block/blk-merge.c | 6=20 block/blk-mq.c | 11=20 block/blk-mq.h | 5=20 block/blk.h | 92 ---- block/genhd.c | 444 +++++--------------- block/ioctl.c | 7=20 block/partitions/core.c | 238 +++-------- drivers/block/drbd/drbd_receiver.c | 2=20 drivers/block/drbd/drbd_worker.c | 2=20 drivers/block/loop.c | 21=20 drivers/block/nbd.c | 6=20 drivers/block/xen-blkback/common.h | 4=20 drivers/block/xen-blkfront.c | 20=20 drivers/block/zram/zram_drv.c | 20=20 drivers/md/bcache/request.c | 4=20 drivers/md/bcache/super.c | 53 -- drivers/md/dm-table.c | 9=20 drivers/md/dm.c | 16=20 drivers/md/md.c | 8=20 drivers/mtd/mtdsuper.c | 17=20 drivers/nvme/target/admin-cmd.c | 20=20 drivers/s390/block/dasd.c | 8=20 drivers/s390/block/dasd_ioctl.c | 9=20 drivers/scsi/scsicam.c | 2=20 drivers/target/target_core_file.c | 6=20 drivers/target/target_core_pscsi.c | 7=20 drivers/usb/gadget/function/storage_common.c | 8=20 fs/block_dev.c | 578 ++++++++------------= ------- fs/btrfs/sysfs.c | 15=20 fs/btrfs/volumes.c | 13=20 fs/ext4/super.c | 18=20 fs/ext4/sysfs.c | 10=20 fs/f2fs/checkpoint.c | 5=20 fs/f2fs/f2fs.h | 2=20 fs/f2fs/super.c | 8=20 fs/f2fs/sysfs.c | 9=20 fs/inode.c | 3=20 fs/internal.h | 7=20 fs/io_uring.c | 10=20 fs/pipe.c | 5=20 fs/pstore/blk.c | 2=20 fs/quota/quota.c | 40 + fs/statfs.c | 2=20 fs/super.c | 86 ---- include/linux/blk-cgroup.h | 4=20 include/linux/blk_types.h | 26 + include/linux/blkdev.h | 24 - include/linux/fs.h | 5=20 include/linux/genhd.h | 104 ---- include/linux/part_stat.h | 17=20 init/do_mounts.c | 271 +++++------- kernel/trace/blktrace.c | 54 -- mm/filemap.c | 9=20 59 files changed, 837 insertions(+), 1716 deletions(-)