Commit ead083ae authored by Al Viro's avatar Al Viro
Browse files

set_blocksize(): switch to passing struct file * 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b85c4298

block/bdev.c

+7 −4
Original line number Diff line number Diff line
@@ -144,8 +144,11 @@ static void set_init_blocksize(struct block_device *bdev) 
	bdev->bd_inode->i_blkbits = blksize_bits(bsize);

}



int set_blocksize(struct block_device *bdev, int size)

int set_blocksize(struct file *file, int size)

{

	struct inode *inode = file->f_mapping->host;

	struct block_device *bdev = I_BDEV(inode);



	/* Size must be a power of two, and between 512 and PAGE_SIZE */

	if (size > PAGE_SIZE || size < 512 || !is_power_of_2(size))

		return -EINVAL;
@@ -155,9 +158,9 @@ int set_blocksize(struct block_device *bdev, int size) 
		return -EINVAL;



	/* Don't change the size if it is same as current */

	if (bdev->bd_inode->i_blkbits != blksize_bits(size)) {

	if (inode->i_blkbits != blksize_bits(size)) {

		sync_blockdev(bdev);

		bdev->bd_inode->i_blkbits = blksize_bits(size);

		inode->i_blkbits = blksize_bits(size);

		kill_bdev(bdev);

	}

	return 0;
@@ -167,7 +170,7 @@ EXPORT_SYMBOL(set_blocksize); 


int sb_set_blocksize(struct super_block *sb, int size)

{

	if (set_blocksize(sb->s_bdev, size))

	if (set_blocksize(sb->s_bdev_file, size))

		return 0;

	/* If we get here, we know size is power of two

	 * and it's value is between 512 and PAGE_SIZE */

block/ioctl.c

+12 −9
Original line number Diff line number Diff line
@@ -473,11 +473,14 @@ static int compat_hdio_getgeo(struct block_device *bdev, 
#endif



/* set the logical block size */

static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode,

static int blkdev_bszset(struct file *file, blk_mode_t mode,

		int __user *argp)

{

	// this one might be file_inode(file)->i_rdev - a rare valid

	// use of file_inode() for those.

	dev_t dev = I_BDEV(file->f_mapping->host)->bd_dev;

	struct file *excl_file;

	int ret, n;

	struct file *file;



	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;
@@ -487,13 +490,13 @@ static int blkdev_bszset(struct block_device *bdev, blk_mode_t mode, 
		return -EFAULT;



	if (mode & BLK_OPEN_EXCL)

		return set_blocksize(bdev, n);

		return set_blocksize(file, n);



	file = bdev_file_open_by_dev(bdev->bd_dev, mode, &bdev, NULL);

	if (IS_ERR(file))

	excl_file = bdev_file_open_by_dev(dev, mode, &dev, NULL);

	if (IS_ERR(excl_file))

		return -EBUSY;

	ret = set_blocksize(bdev, n);

	fput(file);

	ret = set_blocksize(excl_file, n);

	fput(excl_file);

	return ret;

}
@@ -621,7 +624,7 @@ long blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	case BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */

		return put_int(argp, block_size(bdev));

	case BLKBSZSET:

		return blkdev_bszset(bdev, mode, argp);

		return blkdev_bszset(file, mode, argp);

	case BLKGETSIZE64:

		return put_u64(argp, bdev_nr_bytes(bdev));
@@ -681,7 +684,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */

		return put_int(argp, bdev_logical_block_size(bdev));

	case BLKBSZSET_32:

		return blkdev_bszset(bdev, mode, argp);

		return blkdev_bszset(file, mode, argp);

	case BLKGETSIZE64_32:

		return put_u64(argp, bdev_nr_bytes(bdev));

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write) 
		}

		dev_info(ddev, "%lukB available on disc\n", lba << 1);

	}

	set_blocksize(file_bdev(bdev_file), CD_FRAMESIZE);

	set_blocksize(bdev_file, CD_FRAMESIZE);



	return 0;

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, 
	set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);

	set_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state);

	device->dev_stats_valid = 1;

	set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);

	set_blocksize(bdev_file, BTRFS_BDEV_BLOCKSIZE);

	device->fs_devices = fs_devices;



	ret = btrfs_get_dev_zone_info(device, false);

fs/btrfs/volumes.c

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ btrfs_get_bdev_and_sb(const char *device_path, blk_mode_t flags, void *holder, 
	if (flush)

		sync_blockdev(bdev);

	if (holder) {

		ret = set_blocksize(bdev, BTRFS_BDEV_BLOCKSIZE);

		ret = set_blocksize(*bdev_file, BTRFS_BDEV_BLOCKSIZE);

		if (ret) {

			fput(*bdev_file);

			goto error;
@@ -2717,7 +2717,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path 
	set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);

	clear_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state);

	device->dev_stats_valid = 1;

	set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);

	set_blocksize(device->bdev_file, BTRFS_BDEV_BLOCKSIZE);



	if (seeding_dev) {

		btrfs_clear_sb_rdonly(sb);