Commit 3f01727f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.16/bdev-size-2021-10-29' of git://git.kernel.dk/linux-block 

Pull bdev size cleanups from Jens Axboe:
 "Clean up the bdev size handling with new bdev_nr_bytes() helper"

* tag 'for-5.16/bdev-size-2021-10-29' of git://git.kernel.dk/linux-block: (34 commits)
  partitions/ibm: use bdev_nr_sectors instead of open coding it
  partitions/efi: use bdev_nr_bytes instead of open coding it
  block/ioctl: use bdev_nr_sectors and bdev_nr_bytes
  block: cache inode size in bdev
  udf: use sb_bdev_nr_blocks
  reiserfs: use sb_bdev_nr_blocks
  ntfs: use sb_bdev_nr_blocks
  jfs: use sb_bdev_nr_blocks
  ext4: use sb_bdev_nr_blocks
  block: add a sb_bdev_nr_blocks helper
  block: use bdev_nr_bytes instead of open coding it in blkdev_fallocate
  squashfs: use bdev_nr_bytes instead of open coding it
  reiserfs: use bdev_nr_bytes instead of open coding it
  pstore/blk: use bdev_nr_bytes instead of open coding it
  ntfs3: use bdev_nr_bytes instead of open coding it
  nilfs2: use bdev_nr_bytes instead of open coding it
  nfs/blocklayout: use bdev_nr_bytes instead of open coding it
  jfs: use bdev_nr_bytes instead of open coding it
  hfsplus: use bdev_nr_sectors instead of open coding it
  hfs: use bdev_nr_sectors instead of open coding it
  ...
parents 8d1f0177 97eeb5fc

block/fops.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, 
		return -EOPNOTSUPP;



	/* Don't go off the end of the device. */

	isize = i_size_read(bdev->bd_inode);

	isize = bdev_nr_bytes(bdev);

	if (start >= isize)

		return -EINVAL;

	if (end >= isize) {

block/genhd.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ void set_capacity(struct gendisk *disk, sector_t sectors) 


	spin_lock(&bdev->bd_size_lock);

	i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);

	bdev->bd_nr_sectors = sectors;

	spin_unlock(&bdev->bd_size_lock);

}

EXPORT_SYMBOL(set_capacity);

block/ioctl.c

+8 −12
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int blk_ioctl_discard(struct block_device *bdev, fmode_t mode, 
	if (len & 511)

		return -EINVAL;



	if (start + len > i_size_read(bdev->bd_inode))

	if (start + len > bdev_nr_bytes(bdev))

		return -EINVAL;



	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;

	if (len & 511)

		return -EINVAL;

	if (end >= (uint64_t)i_size_read(bdev->bd_inode))

	if (end >= (uint64_t)bdev_nr_bytes(bdev))

		return -EINVAL;

	if (end < start)

		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);

	void __user *argp = (void __user *)arg;

	fmode_t mode = file->f_mode;

	loff_t size;

	int ret;



	/*
@@ -570,10 +569,9 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
		return put_long(argp,

			(bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512);

	case BLKGETSIZE:

		size = i_size_read(bdev->bd_inode);

		if ((size >> 9) > ~0UL)

		if (bdev_nr_sectors(bdev) > ~0UL)

			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 */

	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:

		return blkdev_bszset(bdev, mode, argp);

	case BLKGETSIZE64:

		return put_u64(argp, i_size_read(bdev->bd_inode));

		return put_u64(argp, bdev_nr_bytes(bdev));



	/* Incompatible alignment on i386 */

	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 gendisk *disk = bdev->bd_disk;

	fmode_t mode = file->f_mode;

	loff_t size;



	/*

	 * 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,

			(bdev->bd_disk->bdi->ra_pages * PAGE_SIZE) / 512);

	case BLKGETSIZE:

		size = i_size_read(bdev->bd_inode);

		if ((size >> 9) > ~0UL)

		if (bdev_nr_sectors(bdev) > ~0UL)

			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 */

	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:

		return blkdev_bszset(bdev, mode, argp);

	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 */

	case BLKTRACESETUP32:

block/partitions/core.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ static void bdev_set_nr_sectors(struct block_device *bdev, sector_t sectors) 
{

	spin_lock(&bdev->bd_size_lock);

	i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);

	bdev->bd_nr_sectors = sectors;

	spin_unlock(&bdev->bd_size_lock);

}

block/partitions/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ efi_crc32(const void *buf, unsigned long len) 
 */

static u64 last_lba(struct gendisk *disk)

{

	return div_u64(disk->part0->bd_inode->i_size,

	return div_u64(bdev_nr_bytes(disk->part0),

		       queue_logical_block_size(disk->queue)) - 1ULL;

}