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 5F4B6C4332F for ; Wed, 13 Oct 2021 06:33:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FE4E60E97 for ; Wed, 13 Oct 2021 06:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230138AbhJMGfK (ORCPT ); Wed, 13 Oct 2021 02:35:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229777AbhJMGfJ (ORCPT ); Wed, 13 Oct 2021 02:35:09 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE22FC06174E for ; Tue, 12 Oct 2021 23:33:06 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id d13-20020a17090ad3cd00b0019e746f7bd4so3673166pjw.0 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=mwXBGcUFw390+t3D78uye24eJgF5eAOyfafRWMWFqIBw8ukFyy7DXV6CcBTRiq2onQ WTsQ5O0urVeoJHH+hrqpQ/jzzDiNpjfSq4PnMEX6qCSEINHWDVreOQS0SCIlNgnpvf1v wRVQEhgZ6xZfy2C8SdtDzYv35m/T4slXuv/pkryVFBGwcEUXPOoEZ1WM0oAVdpC0y5p3 LFbFvbCvLBT6fXS6pm5L+Btuf/9hmuEHAHXxa4oDF1WpvJ2AHZbqz4Yq9dyzazvvcUEc I0pMv9Fs4351zleV4X89EnkZm7N02qxZORuGC602PvPrYj+D5/OfiAmq+vkEQwdP1BAK WJsw== X-Gm-Message-State: AOAM533wU2ohsSiPxujCuLed0nXZjKz2qDnkSmYckbOU2iU+eEhrrWvw FNMZSJcD/qeAkEaBNvbwVd7JboqMQP5VFA== 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211013051042.1065752-28-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.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