From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Coly Li <colyli@suse.de>, Mike Snitzer <snitzer@redhat.com>,
Song Liu <song@kernel.org>, David Sterba <dsterba@suse.com>,
Josef Bacik <josef@toxicpanda.com>,
"Theodore Ts'o" <tytso@mit.edu>,
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>,
Dave Kleikamp <shaggy@kernel.org>,
Ryusuke Konishi <konishi.ryusuke@gmail.com>,
Anton Altaparmakov <anton@tuxera.com>,
Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
Kees Cook <keescook@chromium.org>,
Phillip Lougher <phillip@squashfs.org.uk>,
Jan Kara <jack@suse.com>,
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-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, Jan Kara <jack@suse.cz>
Subject: [PATCH 30/30] udf: use sb_bdev_nr_blocks
Date: Mon, 18 Oct 2021 12:11:30 +0200 [thread overview]
Message-ID: <20211018101130.1838532-31-hch@lst.de> (raw)
In-Reply-To: <20211018101130.1838532-1-hch@lst.de>
Use the sb_bdev_nr_blocks helper instead of open coding it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Jan Kara <jack@suse.cz>
---
fs/udf/lowlevel.c | 5 ++---
fs/udf/super.c | 9 +++------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c
index f1094cdcd6cde..46d6971721975 100644
--- a/fs/udf/lowlevel.c
+++ b/fs/udf/lowlevel.c
@@ -47,8 +47,7 @@ unsigned int udf_get_last_session(struct super_block *sb)
unsigned long udf_get_last_block(struct super_block *sb)
{
- struct block_device *bdev = sb->s_bdev;
- struct cdrom_device_info *cdi = disk_to_cdi(bdev->bd_disk);
+ struct cdrom_device_info *cdi = disk_to_cdi(sb->s_bdev->bd_disk);
unsigned long lblock = 0;
/*
@@ -56,7 +55,7 @@ unsigned long udf_get_last_block(struct super_block *sb)
* Try using the device size...
*/
if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock == 0)
- lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits;
+ lblock = sb_bdev_nr_blocks(sb);
if (lblock)
return lblock - 1;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index b2d7c57d06881..34247fba6df91 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1175,8 +1175,7 @@ static int udf_load_vat(struct super_block *sb, int p_index, int type1_index)
struct udf_inode_info *vati;
uint32_t pos;
struct virtualAllocationTable20 *vat20;
- sector_t blocks = i_size_read(sb->s_bdev->bd_inode) >>
- sb->s_blocksize_bits;
+ sector_t blocks = sb_bdev_nr_blocks(sb);
udf_find_vat_block(sb, p_index, type1_index, sbi->s_last_block);
if (!sbi->s_vat_inode &&
@@ -1838,8 +1837,7 @@ static int udf_check_anchor_block(struct super_block *sb, sector_t block,
int ret;
if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV) &&
- udf_fixed_to_variable(block) >=
- i_size_read(sb->s_bdev->bd_inode) >> sb->s_blocksize_bits)
+ udf_fixed_to_variable(block) >= sb_bdev_nr_blocks(sb))
return -EAGAIN;
bh = udf_read_tagged(sb, block, block, &ident);
@@ -1901,8 +1899,7 @@ static int udf_scan_anchors(struct super_block *sb, sector_t *lastblock,
last[last_count++] = *lastblock - 152;
for (i = 0; i < last_count; i++) {
- if (last[i] >= i_size_read(sb->s_bdev->bd_inode) >>
- sb->s_blocksize_bits)
+ if (last[i] >= sb_bdev_nr_blocks(sb))
continue;
ret = udf_check_anchor_block(sb, last[i], fileset);
if (ret != -EAGAIN) {
--
2.30.2
next prev parent reply other threads:[~2021-10-18 10:14 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 10:11 don't use ->bd_inode to access the block device size v3 Christoph Hellwig
2021-10-18 10:11 ` [PATCH 01/30] block: move the SECTOR_SIZE related definitions to blk_types.h Christoph Hellwig
2021-10-18 10:11 ` [PATCH 02/30] block: add a bdev_nr_bytes helper Christoph Hellwig
2021-10-18 10:11 ` [PATCH 03/30] bcache: remove bdev_sectors Christoph Hellwig
2021-10-18 10:11 ` [PATCH 04/30] drbd: use bdev_nr_sectors instead of open coding it Christoph Hellwig
2021-10-18 10:11 ` [PATCH 05/30] dm: use bdev_nr_sectors and bdev_nr_bytes instead of open coding them Christoph Hellwig
2021-10-18 10:11 ` [PATCH 06/30] md: use bdev_nr_sectors instead of open coding it Christoph Hellwig
2021-10-18 10:11 ` [PATCH 07/30] nvmet: use bdev_nr_bytes " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 08/30] target/iblock: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 09/30] fs: use bdev_nr_bytes instead of open coding it in blkdev_max_block Christoph Hellwig
2021-10-18 10:11 ` [PATCH 10/30] fs: simplify init_page_buffers Christoph Hellwig
2021-10-18 10:11 ` [PATCH 11/30] affs: use bdev_nr_sectors instead of open coding it Christoph Hellwig
2021-10-18 10:11 ` [PATCH 12/30] btrfs: use bdev_nr_bytes " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 13/30] cramfs: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 14/30] fat: use bdev_nr_sectors " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 15/30] hfs: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 16/30] hfsplus: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 17/30] jfs: use bdev_nr_bytes " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 18/30] nfs/blocklayout: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 19/30] nilfs2: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 20/30] ntfs3: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 21/30] pstore/blk: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 22/30] reiserfs: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 23/30] squashfs: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 24/30] block: use bdev_nr_bytes instead of open coding it in blkdev_fallocate Christoph Hellwig
2021-10-18 10:11 ` [PATCH 25/30] block: add a sb_bdev_nr_blocks helper Christoph Hellwig
2021-10-18 10:11 ` [PATCH 26/30] ext4: use sb_bdev_nr_blocks Christoph Hellwig
2021-10-18 10:11 ` [PATCH 27/30] jfs: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 28/30] ntfs: " Christoph Hellwig
2021-10-18 10:11 ` [PATCH 29/30] reiserfs: " Christoph Hellwig
2021-10-18 10:11 ` Christoph Hellwig [this message]
2021-10-18 17:16 ` don't use ->bd_inode to access the block device size v3 Jens Axboe
2021-10-18 17:18 ` Christoph Hellwig
2021-10-18 17:40 ` Jens Axboe
2021-10-18 17:49 ` Christoph Hellwig
2021-10-18 17:53 ` Jens Axboe
2021-10-18 17:56 ` Christoph Hellwig
2021-10-19 1:04 ` Kari Argillander
2021-10-19 1:04 ` Jens Axboe
2021-10-18 17:41 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2021-10-15 13:26 don't use ->bd_inode to access the block device size v2 Christoph Hellwig
2021-10-15 13:26 ` [PATCH 30/30] udf: use sb_bdev_nr_blocks Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211018101130.1838532-31-hch@lst.de \
--to=hch@lst.de \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=anton@tuxera.com \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=dsterba@suse.com \
--cc=hirofumi@mail.parknet.co.jp \
--cc=jack@suse.com \
--cc=jack@suse.cz \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=josef@toxicpanda.com \
--cc=keescook@chromium.org \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=phillip@squashfs.org.uk \
--cc=reiserfs-devel@vger.kernel.org \
--cc=shaggy@kernel.org \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).