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=-13.7 required=3.0 tests=BAYES_00,DATE_IN_PAST_06_12, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 A37E3C64E90 for ; Wed, 18 Nov 2020 21:34:44 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E5AD620780 for ; Wed, 18 Nov 2020 21:34:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E5AD620780 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-MZUUtpAwNCeuT3dXT7r7Jg-1; Wed, 18 Nov 2020 16:34:39 -0500 X-MC-Unique: MZUUtpAwNCeuT3dXT7r7Jg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADE711075647; Wed, 18 Nov 2020 21:34:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 904CA60855; Wed, 18 Nov 2020 21:34:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0762118095C9; Wed, 18 Nov 2020 21:34:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AILYVPN000533 for ; Wed, 18 Nov 2020 16:34:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id BA1CE2166BA2; Wed, 18 Nov 2020 21:34:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B55B02166B44 for ; Wed, 18 Nov 2020 21:34:28 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6DEFC80019A for ; Wed, 18 Nov 2020 21:34:28 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-537-Kw0MQKrNMSe6FpFu8N3nfw-1; Wed, 18 Nov 2020 16:34:26 -0500 X-MC-Unique: Kw0MQKrNMSe6FpFu8N3nfw-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id EF58DAFFD; Wed, 18 Nov 2020 21:34:23 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id BC1911E1321; Wed, 18 Nov 2020 15:22:37 +0100 (CET) Date: Wed, 18 Nov 2020 15:22:37 +0100 From: Jan Kara To: Christoph Hellwig Message-ID: <20201118142237.GK1981@quack2.suse.cz> References: <20201118084800.2339180-1-hch@lst.de> <20201118084800.2339180-7-hch@lst.de> MIME-Version: 1.0 In-Reply-To: <20201118084800.2339180-7-hch@lst.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: dm-devel@redhat.com Cc: Jens Axboe , Mike Snitzer , Konrad Rzeszutek Wilk , Richard Weinberger , Josef Bacik , Coly Li , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, dm-devel@redhat.com, linux-mtd@lists.infradead.org, Jan Kara , Tejun Heo , xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-mm@kvack.org Subject: Re: [dm-devel] [PATCH 06/20] block: change the hash used for looking up block devices X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Wed 18-11-20 09:47:46, Christoph Hellwig wrote: > 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 Fair enough. You can add: Reviewed-by: Jan Kara Honza > --- > 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 > -- Jan Kara SUSE Labs, CR -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel