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 1BD6CC433F5 for ; Wed, 13 Oct 2021 09:23:47 +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 CCF9E60ED4 for ; Wed, 13 Oct 2021 09:23:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CCF9E60ED4 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=Ihi82sDKoQXcmOvImMnoPdyOjHR1VPnx8Fzbk6wg7zA=; b=wuqhEHUoNccGpp YEwAhKVoNZWH6Ck/h8hy/TIUmBJzzSchKu8i1+XNXCo8mw/k/PqI/qB//QdJKSwltUjSESqvIv7Pr JEFrEnfv+uBizybONtlNJSyE4QzJbVrBvrW4jmpIvE7y05ugNi3tu79SCUPZ0EH3y5Qcw+V9eR62r O+RtDVhLqcokH+euXP6VPku2fJZVTzx7eczi77HmGZQtPcn8i5meeL7pRvzNrTd1cy69y6Rsby4de Eiaogah5n+XUOUOZrbcHWfyo09wRZDcwB0vVxe7yMuPtnuHPbvMETiertQC+6780jlOvg8rcKKsxc NgnodYozxsluRr5pSrKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1maaTy-00FkqP-C4; Wed, 13 Oct 2021 09:23:30 +0000 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maXp5-00FA3X-AO for linux-nvme@lists.infradead.org; Wed, 13 Oct 2021 06:33:08 +0000 Received: by mail-pj1-x102a.google.com with SMTP id k23-20020a17090a591700b001976d2db364so1471744pji.2 for ; Tue, 12 Oct 2021 23:33:06 -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=WOss03228JS+U0E2OXL79/LG2Z2ctX8IyohOEDd3STQ=; b=SG8eTx4PGHBkPjipBIRHezrGg40X7FKDH3dcqzGEh0ZG/tSW8qND+TAMrNp3f/wqwx MhgHQ6qj4VZF73LZ68/IqBwYNjD0oJqF3VY+z4T9q23FV/6ltSnjivxfcuufOGGKlehP NgIRnRpzLQoV7Ik4Dnr+7MYlEdDMy98DEnQAc= 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=WOss03228JS+U0E2OXL79/LG2Z2ctX8IyohOEDd3STQ=; b=4ddwVcNbxTgBtmI/mAK7TD10KNadoe65wtIPiK1jweDv+YveoeKAanW72s+yHmmgGK 7nXYyf48+jvpyxHWNTvfyrPtG70s+e9u2py+cynwRkFnyEURI3p4zP8PiwsR1DaoH0QX B9PnRSMw8iARPkDVAEDScnrOPqBh2uimW1yqlRLzMNnw7gX0qmba5c3Ne3kGPVNyVzko 1b1CnbQ4JLsUcsKcBVJ6gj7DgME0zR7F+/ZZ+n6jTzHELGVy5+d1zUzJRfX4S/4mPJr2 pveGnAHGP+zBxPH1Ze/7tZjEILcSop7KsvhtcYjM3vUl/dVtapFitCo8b3niACSo8lR2 gsMw== X-Gm-Message-State: AOAM530HgdO9RL8ht+4Px7ywEEWRieI16Yfu36Q8m10Z2fbGIou5APNz +02c6JtZzltQHVjsQqMVXcrAOg== X-Google-Smtp-Source: ABdhPJznx7wYhVexbMFNDV4dCepvElOzihP1I4t7IwLHfcLc7mdWs+S7z03dgD05iBEaGZ31xHHwig== X-Received: by 2002:a17:90b:368a:: with SMTP id mj10mr2200890pjb.201.1634106786111; Tue, 12 Oct 2021 23:33:06 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id r31sm4746519pjg.28.2021.10.12.23.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 23:33:05 -0700 (PDT) Date: Tue, 12 Oct 2021 23:33:04 -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 27/29] ntfs: use sb_bdev_nr_blocks Message-ID: <202110122332.53B5925A@keescook> References: <20211013051042.1065752-1-hch@lst.de> <20211013051042.1065752-28-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211013051042.1065752-28-hch@lst.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211012_233307_427918_A47515E0 X-CRM114-Status: GOOD ( 23.76 ) 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:40AM +0200, Christoph Hellwig wrote: > Use the sb_bdev_nr_blocks helper instead of open coding it. > > Signed-off-by: Christoph Hellwig > --- > fs/ntfs/super.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c > index 0d7e948cb29c9..5ae8de09b271b 100644 > --- a/fs/ntfs/super.c > +++ b/fs/ntfs/super.c > @@ -2772,13 +2772,12 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) > ntfs_debug("Set device block size to %i bytes (block size bits %i).", > blocksize, sb->s_blocksize_bits); > /* Determine the size of the device in units of block_size bytes. */ > - if (!i_size_read(sb->s_bdev->bd_inode)) { > + vol->nr_blocks = sb_bdev_nr_blocks(sb); > + if (!vol->nr_blocks) { I might be worth mentioning in the commit log why this is safe (i.e. the "side effect" of the assignment doesn't need to be delayed since it will be thrown away in the failure path). > if (!silent) > ntfs_error(sb, "Unable to determine device size."); > goto err_out_now; > } > - vol->nr_blocks = i_size_read(sb->s_bdev->bd_inode) >> > - sb->s_blocksize_bits; > /* Read the boot sector and return unlocked buffer head to it. */ > if (!(bh = read_ntfs_boot_sector(sb, silent))) { > if (!silent) > @@ -2816,8 +2815,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) > goto err_out_now; > } > BUG_ON(blocksize != sb->s_blocksize); > - vol->nr_blocks = i_size_read(sb->s_bdev->bd_inode) >> > - sb->s_blocksize_bits; > + vol->nr_blocks = sb_bdev_nr_blocks(sb); > ntfs_debug("Changed device block size to %i bytes (block size " > "bits %i) to match volume sector size.", > blocksize, sb->s_blocksize_bits); Reviewed-by: Kees Cook > -- > 2.30.2 > -- Kees Cook _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme