niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

block/ioctl: use bdev_nr_sectors and bdev_nr_bytes

Browse source 
Use the proper helper to read the block device size.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211019062024.2171074-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2021-10-19 08:20:22 +02:00 • committed by Jens Axboe
parent f09313c57a
commit 946e993730
1 changed files with 8 additions and 12 deletions

20
block/ioctl.c
View file

@ -132,7 +132,7 @@ static int blk_ioctl_discard(struct block_device *bdev, fmode_t mode,
if (len & 511) if (len & 511)
return -EINVAL; return -EINVAL;
if (start + len > i_size_read(bdev->bd_inode)) if (start + len > bdev_nr_bytes(bdev))
return -EINVAL; return -EINVAL;
err = truncate_bdev_range(bdev, mode, start, start + len - 1); err = truncate_bdev_range(bdev, mode, start, start + len - 1);
@ -164,7 +164,7 @@ static int blk_ioctl_zeroout(struct block_device *bdev, fmode_t mode,
return -EINVAL; return -EINVAL;
if (len & 511) if (len & 511)
return -EINVAL; return -EINVAL;
if (end >= (uint64_t)i_size_read(bdev->bd_inode)) if (end >= (uint64_t)bdev_nr_bytes(bdev))
return -EINVAL; return -EINVAL;
if (end < start) if (end < start)
return -EINVAL; return -EINVAL;
@ -543,7 +543,6 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
struct block_device *bdev = I_BDEV(file->f_mapping->host); struct block_device *bdev = I_BDEV(file->f_mapping->host);
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
fmode_t mode = file->f_mode; fmode_t mode = file->f_mode;
loff_t size;
int ret; int ret;
/* /*
@ -570,10 +569,9 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
return put_long(argp, return put_long(argp,
(bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512); (bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512);
case BLKGETSIZE: case BLKGETSIZE:
size = i_size_read(bdev->bd_inode); if (bdev_nr_sectors(bdev) > ~0UL)
if ((size >> 9) > ~0UL)
return -EFBIG; return -EFBIG;
return put_ulong(argp, size >> 9); return put_ulong(argp, bdev_nr_sectors(bdev));
/* The data is compatible, but the command number is different */ /* The data is compatible, but the command number is different */
case BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */ case BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */
@ -581,7 +579,7 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
case BLKBSZSET: case BLKBSZSET:
return blkdev_bszset(bdev, mode, argp); return blkdev_bszset(bdev, mode, argp);
case BLKGETSIZE64: case BLKGETSIZE64:
return put_u64(argp, i_size_read(bdev->bd_inode)); return put_u64(argp, bdev_nr_bytes(bdev));
/* Incompatible alignment on i386 */ /* Incompatible alignment on i386 */
case BLKTRACESETUP: case BLKTRACESETUP:
@ -615,7 +613,6 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
struct block_device *bdev = I_BDEV(file->f_mapping->host); struct block_device *bdev = I_BDEV(file->f_mapping->host);
struct gendisk *disk = bdev->bd_disk; struct gendisk *disk = bdev->bd_disk;
fmode_t mode = file->f_mode; fmode_t mode = file->f_mode;
loff_t size;
/* /*
* O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have
@ -641,10 +638,9 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
return compat_put_long(argp, return compat_put_long(argp,
(bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512); (bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512);
case BLKGETSIZE: case BLKGETSIZE:
size = i_size_read(bdev->bd_inode); if (bdev_nr_sectors(bdev) > ~0UL)
if ((size >> 9) > ~0UL)
return -EFBIG; return -EFBIG;
return compat_put_ulong(argp, size >> 9); return compat_put_ulong(argp, bdev_nr_sectors(bdev));
/* The data is compatible, but the command number is different */ /* The data is compatible, but the command number is different */
case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */ case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */
@ -652,7 +648,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
case BLKBSZSET_32: case BLKBSZSET_32:
return blkdev_bszset(bdev, mode, argp); return blkdev_bszset(bdev, mode, argp);
case BLKGETSIZE64_32: case BLKGETSIZE64_32:
return put_u64(argp, i_size_read(bdev->bd_inode)); return put_u64(argp, bdev_nr_bytes(bdev));
/* Incompatible alignment on i386 */ /* Incompatible alignment on i386 */
case BLKTRACESETUP32: case BLKTRACESETUP32: