tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

udf: use sb_bdev_nr_blocks

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>
Link: https://lore.kernel.org/r/20211018101130.1838532-31-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe e4ae4735 2ffae493

+5 -9
+2 -3
fs/udf/lowlevel.c
··· 47 47 48 48 unsigned long udf_get_last_block(struct super_block *sb) 49 49 { 50 - struct block_device *bdev = sb->s_bdev; 51 - struct cdrom_device_info *cdi = disk_to_cdi(bdev->bd_disk); 50 + struct cdrom_device_info *cdi = disk_to_cdi(sb->s_bdev->bd_disk); 52 51 unsigned long lblock = 0; 53 52 54 53 /* ··· 55 56 * Try using the device size... 56 57 */ 57 58 if (!cdi || cdrom_get_last_written(cdi, &lblock) || lblock == 0) 58 - lblock = i_size_read(bdev->bd_inode) >> sb->s_blocksize_bits; 59 + lblock = sb_bdev_nr_blocks(sb); 59 60 60 61 if (lblock) 61 62 return lblock - 1;
+3 -6
fs/udf/super.c
··· 1175 1175 struct udf_inode_info *vati; 1176 1176 uint32_t pos; 1177 1177 struct virtualAllocationTable20 *vat20; 1178 - sector_t blocks = i_size_read(sb->s_bdev->bd_inode) >> 1179 - sb->s_blocksize_bits; 1178 + sector_t blocks = sb_bdev_nr_blocks(sb); 1180 1179 1181 1180 udf_find_vat_block(sb, p_index, type1_index, sbi->s_last_block); 1182 1181 if (!sbi->s_vat_inode && ··· 1837 1838 int ret; 1838 1839 1839 1840 if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV) && 1840 - udf_fixed_to_variable(block) >= 1841 - i_size_read(sb->s_bdev->bd_inode) >> sb->s_blocksize_bits) 1841 + udf_fixed_to_variable(block) >= sb_bdev_nr_blocks(sb)) 1842 1842 return -EAGAIN; 1843 1843 1844 1844 bh = udf_read_tagged(sb, block, block, &ident); ··· 1899 1901 last[last_count++] = *lastblock - 152; 1900 1902 1901 1903 for (i = 0; i < last_count; i++) { 1902 - if (last[i] >= i_size_read(sb->s_bdev->bd_inode) >> 1903 - sb->s_blocksize_bits) 1904 + if (last[i] >= sb_bdev_nr_blocks(sb)) 1904 1905 continue; 1905 1906 ret = udf_check_anchor_block(sb, last[i], fileset); 1906 1907 if (ret != -EAGAIN) {