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 C2AD3C433F5 for ; Wed, 13 Oct 2021 07:52:38 +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 8D62660462 for ; Wed, 13 Oct 2021 07:52:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8D62660462 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=ZINEbbbhIKQMMCW9qMup3Tk5zHQ7TDZpSNpsYPAK818=; b=cTj8phYfXW6eNl ODvi6cNcgdZpOp+UZ68awp5nHAWOSKzUBVR4i5ybNvxEZS+1F/azcVpkJdAZpdSFSdV6X5pjHqi2i VdKrDbW9hSMxIToB4SOxsyNlGnPi87fhDADgTonyeEcW3czmDlfwoBQQ7RtTAuF+3Hg7ahFqE5n9i l58yOX+IX9/X2BeDpPYB5b+FOVRI2ULvlonfCzuUDWOeZWJs4uDsgsE9SPmy8jY1aKNUrN3BRnl75 x7IAzIhTawl55WnRpX60A8WczeN1hVLJWsWiMovQFjNI+Xj9EYkGrdkhu6FSZ5GaWRo1JFONj1rC6 R4Uy3u8/XA5gULcZRMgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maZ3E-00FSam-Ge; Wed, 13 Oct 2021 07:51:48 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maXll-00F9S0-48 for linux-mtd@lists.infradead.org; Wed, 13 Oct 2021 06:29:42 +0000 Received: by mail-pj1-x1033.google.com with SMTP id oa12-20020a17090b1bcc00b0019f715462a8so1441198pjb.3 for ; Tue, 12 Oct 2021 23:29:40 -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=W+Po2ncML0dagir1ZXD2ovXOKvk/W+c/3o5vm+NA9cQ=; b=QomLyJ/uwXmEgOIdGiIKpgwe7fIN3sqRRqysUR703Xs3YgTlXaMfe2P+HII9dJHv27 pe85K+wWKdH0PewpBtncrX+pK9/vv2ewnDdpNrXhC91Xk/Ncvs9CyiBnb8qEmm15S3FV 6BEJ5rXVDozZ1lv8jDs3uSJtiPb9Dk/ZAAcM0= 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=W+Po2ncML0dagir1ZXD2ovXOKvk/W+c/3o5vm+NA9cQ=; b=vtkxsXqXh0G41+pTAU7fWvnaRmO5VGkkt5yBjXiskUCh9SwZ18wi83oSbNVUBiIzhK TD+pqBGx0ijea0Qd/I8K2cCIrAvsrdpHxct/cmzcG7anFoCxbqpGro+8IjAWzMyxlEvB CFOCbvo0oprbK4wGSeBIsWL4Zdtu+GqVKaUBjBjinsS8lfHXFd8VLC6B7/jBoBKlXVCp 7G2kh/9HBDueYwBN4brsFgyPBc53EpE71ea8Piio7ojoRtuoyvQ0fxU+88F/juBH8KIC YuC4+cLh6yYgTQiDceRyk3liKgk/H6PID4Uok9Wn4o+DKo28QZucP9Y+++EjtZ9KRgE9 ynaQ== X-Gm-Message-State: AOAM531VUuGUgsWWqoUMMpF58C0eDL/VvFZ5hcKeBejHXERCwgSqH2fw ZoAl197neUEDS8ktZ7/uyhztRQ== X-Google-Smtp-Source: ABdhPJwwvDzOMlBdl8uBpL682Y/M/U5HFlms6OXsU9pvWhVrOJHosSbnvoIECvMOshQ6rTYdsLz56g== X-Received: by 2002:a17:90b:4b4c:: with SMTP id mi12mr11492173pjb.57.1634106580411; Tue, 12 Oct 2021 23:29:40 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id x7sm12999948pfj.28.2021.10.12.23.29.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 23:29:39 -0700 (PDT) Date: Tue, 12 Oct 2021 23:29:39 -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: <202110122328.92B4FC41F4@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_232941_216612_9467E3DA X-CRM114-Status: GOOD ( 18.91 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=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); Is s_blocksize_bits always 9 here? If not, this isn't equivalent. -Kees > 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 MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/