Commit 6549a874 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

block: convert fops.c magic constants to SHIFT_SECTOR 



Don't use shifting by a magic number 9 but replace with a more
descriptive SHIFT_SECTOR.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/068782b9f7e97569fb59a99529b23bb17ea4c5e2.1634755800.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 179ae84f

block/fops.c

+10 −8
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb, 


	bio_init(&bio, vecs, nr_pages);

	bio_set_dev(&bio, bdev);

	bio.bi_iter.bi_sector = pos >> 9;

	bio.bi_iter.bi_sector = pos >> SECTOR_SHIFT;

	bio.bi_write_hint = iocb->ki_hint;

	bio.bi_private = current;

	bio.bi_end_io = blkdev_bio_end_io_simple;
@@ -225,7 +225,7 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 


	for (;;) {

		bio_set_dev(bio, bdev);

		bio->bi_iter.bi_sector = pos >> 9;

		bio->bi_iter.bi_sector = pos >> SECTOR_SHIFT;

		bio->bi_write_hint = iocb->ki_hint;

		bio->bi_private = dio;

		bio->bi_end_io = blkdev_bio_end_io;
@@ -565,16 +565,18 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, 
	switch (mode) {

	case FALLOC_FL_ZERO_RANGE:

	case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE:

		error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9,

					    GFP_KERNEL, BLKDEV_ZERO_NOUNMAP);

		error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,

					     len >> SECTOR_SHIFT, GFP_KERNEL,

					     BLKDEV_ZERO_NOUNMAP);

		break;

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE:

		error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9,

					     GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK);

		error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,

					     len >> SECTOR_SHIFT, GFP_KERNEL,

					     BLKDEV_ZERO_NOFALLBACK);

		break;

	case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE:

		error = blkdev_issue_discard(bdev, start >> 9, len >> 9,

					     GFP_KERNEL, 0);

		error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,

					     len >> SECTOR_SHIFT, GFP_KERNEL, 0);

		break;

	default:

		error = -EOPNOTSUPP;