@@ -76,7 +76,7 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb,
76
76
77
77
bio_init (& bio , vecs , nr_pages );
78
78
bio_set_dev (& bio , bdev );
79
- bio .bi_iter .bi_sector = pos >> 9 ;
79
+ bio .bi_iter .bi_sector = pos >> SECTOR_SHIFT ;
80
80
bio .bi_write_hint = iocb -> ki_hint ;
81
81
bio .bi_private = current ;
82
82
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,
225
225
226
226
for (;;) {
227
227
bio_set_dev (bio , bdev );
228
- bio -> bi_iter .bi_sector = pos >> 9 ;
228
+ bio -> bi_iter .bi_sector = pos >> SECTOR_SHIFT ;
229
229
bio -> bi_write_hint = iocb -> ki_hint ;
230
230
bio -> bi_private = dio ;
231
231
bio -> bi_end_io = blkdev_bio_end_io ;
@@ -565,16 +565,18 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start,
565
565
switch (mode ) {
566
566
case FALLOC_FL_ZERO_RANGE :
567
567
case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE :
568
- error = blkdev_issue_zeroout (bdev , start >> 9 , len >> 9 ,
569
- GFP_KERNEL , BLKDEV_ZERO_NOUNMAP );
568
+ error = blkdev_issue_zeroout (bdev , start >> SECTOR_SHIFT ,
569
+ len >> SECTOR_SHIFT , GFP_KERNEL ,
570
+ BLKDEV_ZERO_NOUNMAP );
570
571
break ;
571
572
case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE :
572
- error = blkdev_issue_zeroout (bdev , start >> 9 , len >> 9 ,
573
- GFP_KERNEL , BLKDEV_ZERO_NOFALLBACK );
573
+ error = blkdev_issue_zeroout (bdev , start >> SECTOR_SHIFT ,
574
+ len >> SECTOR_SHIFT , GFP_KERNEL ,
575
+ BLKDEV_ZERO_NOFALLBACK );
574
576
break ;
575
577
case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE :
576
- error = blkdev_issue_discard (bdev , start >> 9 , len >> 9 ,
577
- GFP_KERNEL , 0 );
578
+ error = blkdev_issue_discard (bdev , start >> SECTOR_SHIFT ,
579
+ len >> SECTOR_SHIFT , GFP_KERNEL , 0 );
578
580
break ;
579
581
default :
580
582
error = - EOPNOTSUPP ;
0 commit comments