summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-10-18 12:11:14 +0200
committerJens Axboe <axboe@kernel.dk>2021-10-18 14:43:22 -0600
commit9e48243b6506be0970d04fe2f015b1b3520ef9f3 (patch)
treeb1f4816df6b4b552f6da149db3e7c2418ffc39a3
parent5816e91e4a14955224ae600dfea460d22588230a (diff)
downloadlinux-9e48243b6506be0970d04fe2f015b1b3520ef9f3.tar.gz
linux-9e48243b6506be0970d04fe2f015b1b3520ef9f3.tar.bz2
linux-9e48243b6506be0970d04fe2f015b1b3520ef9f3.zip
fat: use bdev_nr_sectors instead of open coding it
Use the proper helper to read the block device size. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20211018101130.1838532-15-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--fs/fat/inode.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index de0c9b013a85..9f3cd03668ad 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1536,14 +1536,11 @@ static int fat_read_static_bpb(struct super_block *sb,
struct fat_bios_param_block *bpb)
{
static const char *notdos1x = "This doesn't look like a DOS 1.x volume";
-
+ sector_t bd_sects = bdev_nr_sectors(sb->s_bdev);
struct fat_floppy_defaults *fdefaults = NULL;
int error = -EINVAL;
- sector_t bd_sects;
unsigned i;
- bd_sects = i_size_read(sb->s_bdev->bd_inode) / SECTOR_SIZE;
-
/* 16-bit DOS 1.x reliably wrote bootstrap short-jmp code */
if (b->ignored[0] != 0xeb || b->ignored[2] != 0x90) {
if (!silent)