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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2B99C433EF for ; Wed, 13 Oct 2021 09:20:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 800F960EB4 for ; Wed, 13 Oct 2021 09:20:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 800F960EB4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iiQkuwk8VlduXYBsV0r5bcwhuGigEHnrHSyNK75zVJY=; b=g8XNwLeJUIYnpX yDYIyxQ0d64l48GWYUDszP9id2Cy8kzfGvMseJz4mgFvlardxGj7TADUHfhnCJLBvfQfBurrugzDw LTOqEm/jd2w0zzgFn2gdIIs5XRveESL4RwdOxELluAB0asmoY2QJmuL9XtSU27WyS3+Po9pwwbbEi SkbHR+/KJaLv84HRIhWq3WPxMuAQv7SV0PuIs1CZwXiVEFYElf+Gu0OXeaG2glB4292Xiqwa9DiIu 8b/NiwAsnRCs/pS576kvLMsdJOaKKkKUhomU3bsf7jO2yfcPxmgwLqmiCBKY3IS/HHyjJRwDcc5w7 s7dV6zcnVY+KDvdZn/yQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maaQa-00FkLr-4j; Wed, 13 Oct 2021 09:20:00 +0000 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maXmn-00F9df-Ke for linux-nvme@lists.infradead.org; Wed, 13 Oct 2021 06:30:47 +0000 Received: by mail-pf1-x42c.google.com with SMTP id x130so1553909pfd.6 for ; Tue, 12 Oct 2021 23:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=VuQ9K07zKhFVmW27yAURvZgXNg5Kde2VB7A9n6/jcRM=; b=UofdAPLwzqN9irjKYpz7rqdpJba6YSanghzltJ7hygDQHnFxjoYnCn4YD0xclCWyyn 1QGVCjAoCfMyHBxT5bED+JODP9R8TqKO5BZ3Ypckfrxuser3a0TwMhxL4/T0VMAtKJpU VKx0vRkqgm8Bnukgx8yTpvFmvLGoFoDP/yYAY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=VuQ9K07zKhFVmW27yAURvZgXNg5Kde2VB7A9n6/jcRM=; b=f49rHAYz0S5IYJalULhtrMQsRLwA+dj6qiNv9WYM5NU9eyeb7aQ4M6H04Pgmhmr+7l kJqlZCLDV3CBh/AKTn3BwX0KK0GpFT10ykm78RYL+vE2OjeuuiaxWweBzBDjIsTkocZL oif0oEqufxIR/Hk3/uD9N5uCnTWMdUL/nkWJDnAEd7C/l3p8PZhRYdS5fKFssqgDoSVo /jRppH4W1PqqS6GGILSEUYAuweHoQmZCslsPUgKoiAI9YUSc/nSy5N9ftfBCr3HVSJRj 4LDIdzmWHuGRofECn6HkVrvBkadKoM32MZVbAlkREHcikAmfRadoofdwgt1nBZe61/cE h8SA== X-Gm-Message-State: AOAM531MBvLy/U722JlQi2P3gedLywJroR3DO1zr8fESs1YHonicJYyS zc14H3owPxkVLlbq2J3TtmSVsQ== X-Google-Smtp-Source: ABdhPJxi3MilTVqoy9Kf7ydXOCYXbOlyCyon1KO3ew5UZssKOax53PkSESvwHqWMi+XXw8wleT4Yrw== X-Received: by 2002:a05:6a00:ccb:b0:44c:eb4b:f24e with SMTP id b11-20020a056a000ccb00b0044ceb4bf24emr25691167pfv.16.1634106644424; Tue, 12 Oct 2021 23:30:44 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id z10sm12678073pfn.70.2021.10.12.23.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 23:30:44 -0700 (PDT) Date: Tue, 12 Oct 2021 23:30:43 -0700 From: Kees Cook To: Christoph Hellwig Cc: Jens Axboe , Coly Li , Mike Snitzer , Song Liu , David Sterba , Josef Bacik , Theodore Ts'o , OGAWA Hirofumi , Dave Kleikamp , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Phillip Lougher , Jan Kara , linux-block@vger.kernel.org, dm-devel@redhat.com, drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-mtd@lists.infradead.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev, reiserfs-devel@vger.kernel.org Subject: Re: [PATCH 25/29] ext4: use sb_bdev_nr_blocks Message-ID: <202110122330.6E549D2@keescook> References: <20211013051042.1065752-1-hch@lst.de> <20211013051042.1065752-26-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211013051042.1065752-26-hch@lst.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_233045_732570_24AE3F52 X-CRM114-Status: GOOD ( 19.52 ) X-Mailman-Approved-At: Wed, 13 Oct 2021 01:15:58 -0700 X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Wed, Oct 13, 2021 at 07:10:38AM +0200, Christoph Hellwig wrote: > Use the sb_bdev_nr_blocks helper instead of open coding it. > > Signed-off-by: Christoph Hellwig > --- > fs/ext4/super.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 0775950ee84e3..3dde8be5df490 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -4468,7 +4468,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) > goto cantfind_ext4; > > /* check blocks count against device size */ > - blocks_count = sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits; > + blocks_count = sb_bdev_nr_blocks(sb); Wait, my bad. Yes, this is fine. It's going through two helpers. :) Reviewed-by: Kees Cook > if (blocks_count && ext4_blocks_count(es) > blocks_count) { > ext4_msg(sb, KERN_WARNING, "bad geometry: block count %llu " > "exceeds size of device (%llu blocks)", > -- > 2.30.2 > -- Kees Cook _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme