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 BBB58C433EF for ; Wed, 13 Oct 2021 06:29:55 +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-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 380FC60FDC for ; Wed, 13 Oct 2021 06:29:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 380FC60FDC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=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-483-mn_cO2VpOK2OqohbRkgmpA-1; Wed, 13 Oct 2021 02:29:52 -0400 X-MC-Unique: mn_cO2VpOK2OqohbRkgmpA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8C10801AA7; Wed, 13 Oct 2021 06:29:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 982C510016F4; Wed, 13 Oct 2021 06:29:47 +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 3E70D4EA2A; Wed, 13 Oct 2021 06:29:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19D6Tkje029233 for ; Wed, 13 Oct 2021 02:29:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A1752026D5D; Wed, 13 Oct 2021 06:29:46 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 50BE12026D60 for ; Wed, 13 Oct 2021 06:29:43 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73BB9899EC0 for ; Wed, 13 Oct 2021 06:29:43 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-183-NtGj3fQVOp-pwHWAdeJq7g-1; Wed, 13 Oct 2021 02:29:41 -0400 X-MC-Unique: NtGj3fQVOp-pwHWAdeJq7g-1 Received: by mail-pl1-f173.google.com with SMTP id x4so1115870pln.5 for ; Tue, 12 Oct 2021 23:29:41 -0700 (PDT) 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=VvqX2N69PYSsjKgmWCwLR8I9YQoDB43G6oi38w/oyh6P7/L+Itscsls6NhiRTRP8Ld AvDGczASR26XAVJ0pDRud7TE4+IAhzGBZ6DZ4FHlrFlowwHRWRZj0qDYBkxS05UhJU+w lCxOxJhXZALn9rgx1Vt4GpvqI61hDy0f2aJp/Rh80h1tzDqZ4P8yTGIOHCj7K2pVGSOP HY+dQ0II5nhRKVF3u5/9PQqG5Cb+NZBL5La2WhdnitB2VrqnHn/iWcjaht+qhypQiQc1 nJgNOX4ti6cO7lsqnQgjrIh7OkGii6T9s0djdRfaUrsduavt7YLFsJcLUtShuvNajfVh dOXQ== X-Gm-Message-State: AOAM530lhymb7GtVU5jf6KNaBtIJyRY8TMW8BKK5HLlwsX4Fl0ljvT3A hCKDPx7QDROfO6Uxub4ROstHsQ== 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 Message-ID: <202110122328.92B4FC41F4@keescook> References: <20211013051042.1065752-1-hch@lst.de> <20211013051042.1065752-26-hch@lst.de> MIME-Version: 1.0 In-Reply-To: <20211013051042.1065752-26-hch@lst.de> 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.4 X-loop: dm-devel@redhat.com Cc: Dave Kleikamp , jfs-discussion@lists.sourceforge.net, Mike Snitzer , linux-nvme@lists.infradead.org, Konstantin Komarov , Song Liu , dm-devel@redhat.com, target-devel@vger.kernel.org, linux-mtd@lists.infradead.org, reiserfs-devel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-nilfs@vger.kernel.org, linux-scsi@vger.kernel.org, OGAWA Hirofumi , linux-ext4@vger.kernel.org, Josef Bacik , Coly Li , linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, David Sterba , Ryusuke Konishi , Anton Altaparmakov , Jens Axboe , linux-block@vger.kernel.org, linux-nfs@vger.kernel.org, Theodore Ts'o , linux-ntfs-dev@lists.sourceforge.net, Jan Kara , linux-fsdevel@vger.kernel.org, Phillip Lougher , ntfs3@lists.linux.dev, linux-btrfs@vger.kernel.org Subject: Re: [dm-devel] [PATCH 25/29] ext4: use sb_bdev_nr_blocks 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.84 on 10.5.11.22 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, 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 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel 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 26FDFC433F5 for ; Wed, 13 Oct 2021 06:29:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 072D360FDC for ; Wed, 13 Oct 2021 06:29:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237999AbhJMGbo (ORCPT ); Wed, 13 Oct 2021 02:31:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237867AbhJMGbn (ORCPT ); Wed, 13 Oct 2021 02:31:43 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF8F1C061746 for ; Tue, 12 Oct 2021 23:29:40 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id y4so1149016plb.0 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=RRIa/9mW6hjFLVOpWeWvW38CerPEEaocRuAQvrYUpBocuxRIigzHfqN8NEdBoG5SGP xtfX+WRq/TOeRRRVDp4p2VqW8g88zI2gzsooxsnMaNox6uMW6Th9NHE0R0/AwMFfgZaf I93L3xX+H+QtVDaX/Lz5QYIgYfrCnKBMdSlwgZbL4/Ja8alOj0ojpxq1MTAja/kB1wiU 8PuvPmeQbbuiMUVYVqGwQ8eL0zXH3UTwtBCbmvD9GFQtGXFZ3uDK5Dnx5A8A93G//JSu eyNPteFOlz+H3Y5AsGH310ZK6zBMgOhtiL0Qf0Lnz1Q8InizkegUHi6ynxhwEMI+4e9t hecg== X-Gm-Message-State: AOAM5324DQbdkKa0p7WKj0UsHjSx69WMm7QGBbotdRBev4kMRygxdnLP 65B5YRZ1omBJBd+vimCY8+euVg== 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211013051042.1065752-26-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-bcache@vger.kernel.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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kees Cook Subject: Re: [PATCH 25/29] ext4: use sb_bdev_nr_blocks Date: Tue, 12 Oct 2021 23:29:39 -0700 Message-ID: <202110122328.92B4FC41F4@keescook> References: <20211013051042.1065752-1-hch@lst.de> <20211013051042.1065752-26-hch@lst.de> Mime-Version: 1.0 Return-path: 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= Content-Disposition: inline In-Reply-To: <20211013051042.1065752-26-hch@lst.de> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 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 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/ 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 3BE2FC433EF for ; Wed, 13 Oct 2021 09:18:46 +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 03C4F610CC for ; Wed, 13 Oct 2021 09:18:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 03C4F610CC 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=CXR2U3CGa8lUmcjVwg7PaY95U1F7gOQZNX9RyuEvw1A=; b=0Mpw4wcv3EESHw 4kFBwhSGff+IW7PnBGJnLF7/ydK4OqLvRXn9fxtKUl5HDLMiBwx6R+hzSdHBIzsjPtxCpdM4J4EV2 HFDO4MJOK3SN++pc8Wl9lV1H5kZ1BhyAUxNfg8yMm/99W+5WgVzpCFQcqaq2HW20HjPQDEDVucSdy 06zZBgQZbY29imYSoFLo/D4iAF8wlHOWPLubhyBVeD6mfpk7QtnaOSNlLUgXTjgD28rVeufSfHJtY oFZ+i21xEKtSPIuxYhALN52TA80OeRbjRuCdqR91WGDWu0zxZFK9uQmRVBE4OmnIbzJ+rfO90x7RC ET2ZZeNgPJ74wQYXZbxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maaP9-00Fk9X-Ey; Wed, 13 Oct 2021 09:18:31 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maXll-00F9S1-MF for linux-nvme@lists.infradead.org; Wed, 13 Oct 2021 06:29:42 +0000 Received: by mail-pl1-x636.google.com with SMTP id w14so1123363pll.2 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=ajPHD6Dw4szFZvJkTcjN04OSLw/gkNrkEdL2x5kkB2TFTciqaS/AFKSjqQaTXLuNuE WUSQXzapiTFOzepDuixahgLEkzzydPSNJdKAEipgmx+DpFgVwpUfGeyAJpCS83QWgKI5 t10thcyqPm65cdLizGtlCgt4yMyRReO3r3prKbjVtqVG0GdvveDPyGJX+9U7S0PnC5u3 BtzF55Ms6KZV4q8o/LcWWQUxV0URGLdoxANbi8AYYr65RFeSwfNI/+k+tgyXgsYhe6xT 9STEWzFOkl75sOE3uNs1kFFz9yHH6APDLcq3WcT7N4sOolOMArwZw0XN43i44nqLpYXF tvlA== X-Gm-Message-State: AOAM5331+z0h3ZVWozFZoEXLw1pH1qlzUAZsM/OfpjTXNtQbs4JfT9Lg fSf2HQ/zKGgHzyPlxqHhzn8Xog== 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_752499_3F040C80 X-CRM114-Status: GOOD ( 19.54 ) 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); 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-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mail19.linbit.com (LINBIT Mail Daemon) with ESMTP id 97A83420004 for ; Wed, 13 Oct 2021 08:29:41 +0200 (CEST) Received: by mail-pl1-f171.google.com with SMTP id v20so1107345plo.7 for ; Tue, 12 Oct 2021 23:29:41 -0700 (PDT) Date: Tue, 12 Oct 2021 23:29:39 -0700 From: Kees Cook To: Christoph Hellwig Message-ID: <202110122328.92B4FC41F4@keescook> References: <20211013051042.1065752-1-hch@lst.de> <20211013051042.1065752-26-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211013051042.1065752-26-hch@lst.de> Cc: Dave Kleikamp , jfs-discussion@lists.sourceforge.net, Mike Snitzer , linux-nvme@lists.infradead.org, Konstantin Komarov , Song Liu , dm-devel@redhat.com, target-devel@vger.kernel.org, linux-mtd@lists.infradead.org, reiserfs-devel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-nilfs@vger.kernel.org, linux-scsi@vger.kernel.org, OGAWA Hirofumi , linux-ext4@vger.kernel.org, Josef Bacik , Coly Li , linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, David Sterba , Ryusuke Konishi , Anton Altaparmakov , Jens Axboe , linux-block@vger.kernel.org, linux-nfs@vger.kernel.org, Theodore Ts'o , linux-ntfs-dev@lists.sourceforge.net, Jan Kara , linux-fsdevel@vger.kernel.org, Phillip Lougher , ntfs3@lists.linux.dev, linux-btrfs@vger.kernel.org Subject: Re: [Drbd-dev] [PATCH 25/29] ext4: use sb_bdev_nr_blocks List-Id: "*Coordination* of development, patches, contributions -- *Questions* \(even to developers\) go to drbd-user, please." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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