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

Commit 9a794fb9 authored by Jens Axboe's avatar Jens Axboe
Browse files

block_dev: get rid of blksize bits calculation 



We store the bits in the bdev sector size locally, but we don't use
the calculation anymore. All we do with it is shift it back up to
the bdev sector size. So let's just use that directly and kill the
variable and bits calculation.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4d1a4765

fs/block_dev.c

+4 −4
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, 
{

	struct file *file = iocb->ki_filp;

	struct block_device *bdev = I_BDEV(bdev_file_inode(file));

	unsigned blkbits = blksize_bits(bdev_logical_block_size(bdev));

	struct bio_vec inline_vecs[DIO_INLINE_BIO_VECS], *vecs, *bvec;

	loff_t pos = iocb->ki_pos;

	bool should_dirty = false;
@@ -211,7 +210,8 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, 
	blk_qc_t qc;

	int i;



	if ((pos | iov_iter_alignment(iter)) & ((1 << blkbits) - 1))

	if ((pos | iov_iter_alignment(iter)) &

	    (bdev_logical_block_size(bdev) - 1))

		return -EINVAL;



	if (nr_pages <= DIO_INLINE_BIO_VECS)
@@ -331,7 +331,6 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) 
	struct file *file = iocb->ki_filp;

	struct inode *inode = bdev_file_inode(file);

	struct block_device *bdev = I_BDEV(inode);

	unsigned blkbits = blksize_bits(bdev_logical_block_size(bdev));

	struct blkdev_dio *dio;

	struct bio *bio;

	bool is_read = (iov_iter_rw(iter) == READ);
@@ -339,7 +338,8 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) 
	blk_qc_t qc = BLK_QC_T_NONE;

	int ret;



	if ((pos | iov_iter_alignment(iter)) & ((1 << blkbits) - 1))

	if ((pos | iov_iter_alignment(iter)) &

	    (bdev_logical_block_size(bdev) - 1))

		return -EINVAL;



	bio = bio_alloc_bioset(GFP_KERNEL, nr_pages, blkdev_dio_pool);