From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Tejun Heo <tj@kernel.org>, Josef Bacik <josef@toxicpanda.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Coly Li <colyli@suse.de>, Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com, Richard Weinberger <richard@nod.at>,
Jan Kara <jack@suse.com>,
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: [PATCH 06/20] block: change the hash used for looking up block devices
Date: Wed, 18 Nov 2020 09:47:46 +0100 [thread overview]
Message-ID: <20201118084800.2339180-7-hch@lst.de> (raw)
In-Reply-To: <20201118084800.2339180-1-hch@lst.de>
Adding the minor to the major creates tons of pointless conflicts. Just
use the dev_t itself, which is 32-bits and thus is guaranteed to fit
into ino_t.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/block_dev.c | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index d8664f5c1ff669..29db12c3bb501c 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -870,35 +870,12 @@ void __init bdev_cache_init(void)
blockdev_superblock = bd_mnt->mnt_sb; /* For writeback */
}
-/*
- * Most likely _very_ bad one - but then it's hardly critical for small
- * /dev and can be fixed when somebody will need really large one.
- * Keep in mind that it will be fed through icache hash function too.
- */
-static inline unsigned long hash(dev_t dev)
-{
- return MAJOR(dev)+MINOR(dev);
-}
-
-static int bdev_test(struct inode *inode, void *data)
-{
- return BDEV_I(inode)->bdev.bd_dev == *(dev_t *)data;
-}
-
-static int bdev_set(struct inode *inode, void *data)
-{
- BDEV_I(inode)->bdev.bd_dev = *(dev_t *)data;
- return 0;
-}
-
static struct block_device *bdget(dev_t dev)
{
struct block_device *bdev;
struct inode *inode;
- inode = iget5_locked(blockdev_superblock, hash(dev),
- bdev_test, bdev_set, &dev);
-
+ inode = iget_locked(blockdev_superblock, dev);
if (!inode)
return NULL;
@@ -910,6 +887,7 @@ static struct block_device *bdget(dev_t dev)
bdev->bd_super = NULL;
bdev->bd_inode = inode;
bdev->bd_part_count = 0;
+ bdev->bd_dev = dev;
inode->i_mode = S_IFBLK;
inode->i_rdev = dev;
inode->i_bdev = bdev;
--
2.29.2
next prev parent reply other threads:[~2020-11-18 8:48 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 8:47 merge struct block_device and struct hd_struct Christoph Hellwig
2020-11-18 8:47 ` [PATCH 01/20] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig
2020-11-18 14:09 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-24 12:26 ` Tejun Heo
2020-11-18 8:47 ` [PATCH 02/20] block: remove a duplicate __disk_get_part prototype Christoph Hellwig
2020-11-18 14:10 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 03/20] block: add a bdev_kobj helper Christoph Hellwig
2020-11-18 14:18 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 04/20] block: use disk_part_iter_exit in disk_part_iter_next Christoph Hellwig
2020-11-18 14:19 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 05/20] block: use put_device in put_disk Christoph Hellwig
2020-11-18 14:20 ` Jan Kara
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` Christoph Hellwig [this message]
2020-11-18 14:22 ` [PATCH 06/20] block: change the hash used for looking up block devices Jan Kara
2020-11-18 8:47 ` [PATCH 07/20] init: refactor name_to_dev_t Christoph Hellwig
2020-11-18 14:37 ` Jan Kara
2020-11-19 7:52 ` Christoph Hellwig
2020-11-19 8:25 ` Jan Kara
2020-11-20 8:49 ` Christoph Hellwig
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 08/20] init: refactor devt_from_partuuid Christoph Hellwig
2020-11-18 14:41 ` Jan Kara
2020-11-18 8:47 ` [PATCH 09/20] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig
2020-11-18 14:42 ` Jan Kara
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 10/20] block: refactor __blkdev_put Christoph Hellwig
2020-11-18 14:46 ` Jan Kara
2020-11-18 8:47 ` [PATCH 11/20] block: reference struct block_device from struct hd_struct Christoph Hellwig
2020-11-19 9:41 ` Jan Kara
2020-11-20 8:56 ` Christoph Hellwig
2020-11-24 16:59 ` Tejun Heo
2020-11-25 11:40 ` Jan Kara
2020-11-25 12:09 ` Tejun Heo
2020-11-18 8:47 ` [PATCH 12/20] block: simplify the block device claiming interface Christoph Hellwig
2020-11-19 10:07 ` Jan Kara
2020-11-18 8:47 ` [PATCH 13/20] block: remove ->bd_contains Christoph Hellwig
2020-11-19 10:32 ` Jan Kara
2020-11-20 9:01 ` Christoph Hellwig
2020-11-18 8:47 ` [PATCH 14/20] block: remove the nr_sects field in struct hd_struct Christoph Hellwig
2020-11-19 12:05 ` Jan Kara
2020-11-20 9:08 ` Christoph Hellwig
2020-11-20 11:21 ` Jan Kara
2020-11-20 15:32 ` Christoph Hellwig
2020-11-20 15:59 ` Matthew Wilcox
2020-11-20 16:01 ` Christoph Hellwig
2020-11-20 20:05 ` Jan Kara
2020-11-21 16:24 ` Christoph Hellwig
2020-11-18 8:47 ` [PATCH 15/20] block: merge struct block_device and " Christoph Hellwig
2020-11-19 14:39 ` Jan Kara
2020-11-20 9:15 ` Christoph Hellwig
2020-11-20 10:53 ` Jan Kara
2020-11-18 8:47 ` [PATCH 16/20] block: stop using bdget_disk for partition 0 Christoph Hellwig
2020-11-19 14:43 ` Jan Kara
2020-11-18 8:47 ` [PATCH 17/20] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig
2020-11-19 14:53 ` Jan Kara
2020-11-19 15:13 ` Matthew Wilcox
2020-11-20 9:17 ` Christoph Hellwig
2020-11-18 8:47 ` [PATCH 18/20] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig
2020-11-19 14:59 ` Jan Kara
2020-11-18 8:47 ` [PATCH 19/20] bcache: remove a superflous lookup_bdev all Christoph Hellwig
2020-11-18 8:54 ` Coly Li
2020-11-18 9:10 ` Greg KH
2020-11-18 9:55 ` Coly Li
2020-11-18 16:24 ` Christoph Hellwig
2020-11-18 8:48 ` [PATCH 20/20] block: remove i_bdev Christoph Hellwig
2020-11-18 8:56 ` merge struct block_device and struct hd_struct Jan Beulich
2020-11-18 8:58 ` Christoph Hellwig
2020-11-18 9:04 ` Jan Beulich
2020-11-18 9:08 ` Christoph Hellwig
2020-11-18 9:09 ` Greg KH
2020-11-18 9:23 ` Jan Beulich
2020-11-18 9:32 ` Greg KH
2020-11-18 12:50 ` Matthew Wilcox
2020-11-18 9:13 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201118084800.2339180-7-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=jack@suse.com \
--cc=josef@toxicpanda.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
--cc=snitzer@redhat.com \
--cc=tj@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).