Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a0740c4 authored by Omar Sandoval's avatar Omar Sandoval Committed by Jens Axboe
Browse files

loop: get rid of lo_blocksize 



This is only used for setting the soft block size on the struct
block_device once and then never used again.

Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 24d90bb2

drivers/block/loop.c

+2 −8
Original line number Diff line number Diff line
@@ -573,8 +573,6 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p) 
	mapping = file->f_mapping;

	mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);

	lo->lo_backing_file = file;

	lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ?

		mapping->host->i_bdev->bd_block_size : PAGE_SIZE;

	lo->old_gfp_mask = mapping_gfp_mask(mapping);

	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));

	loop_update_dio(lo);
@@ -867,7 +865,6 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 
	struct file	*file, *f;

	struct inode	*inode;

	struct address_space *mapping;

	unsigned lo_blocksize;

	int		lo_flags = 0;

	int		error;

	loff_t		size;
@@ -911,9 +908,6 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 
	    !file->f_op->write_iter)

		lo_flags |= LO_FLAGS_READ_ONLY;



	lo_blocksize = S_ISBLK(inode->i_mode) ?

		inode->i_bdev->bd_block_size : PAGE_SIZE;



	error = -EFBIG;

	size = get_loop_size(lo, file);

	if ((loff_t)(sector_t)size != size)
@@ -927,7 +921,6 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 
	set_device_ro(bdev, (lo_flags & LO_FLAGS_READ_ONLY) != 0);



	lo->use_dio = false;

	lo->lo_blocksize = lo_blocksize;

	lo->lo_device = bdev;

	lo->lo_flags = lo_flags;

	lo->lo_backing_file = file;
@@ -947,7 +940,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, 
	/* let user-space know about the new size */

	kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE);



	set_blocksize(bdev, lo_blocksize);

	set_blocksize(bdev, S_ISBLK(inode->i_mode) ?

		      block_size(inode->i_bdev) : PAGE_SIZE);



	lo->lo_state = Lo_bound;

	if (part_shift)

drivers/block/loop.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ struct loop_device { 


	struct file *	lo_backing_file;

	struct block_device *lo_device;

	unsigned	lo_blocksize;

	void		*key_data; 



	gfp_t		old_gfp_mask;