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

Commit 22375701 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block_dev: remove DAX leftovers 



DAX support for block devices was removed in commits 03cdad
("block: disable block device DAX by default") and 99a01cdf
("block: remove BLK_DEV_DAX config option"), but we still kept a call to
dax_do_io and some uneeded i_flags manipulations introduced in commit
bbab37 ("block: Add support for DAX reads/writes to block devices").

Remove those leftovers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d21ea4bc

fs/block_dev.c

+1 −10
Original line number Diff line number Diff line
@@ -180,9 +180,6 @@ blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	struct file *file = iocb->ki_filp;

	struct inode *inode = bdev_file_inode(file);



	if (IS_DAX(inode))

		return dax_do_io(iocb, inode, iter, blkdev_get_block,

				NULL, DIO_SKIP_DIO_COUNT);

	return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter,

				    blkdev_get_block, NULL, NULL,

				    DIO_SKIP_DIO_COUNT);
@@ -1275,7 +1272,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
		bdev->bd_disk = disk;

		bdev->bd_queue = disk->queue;

		bdev->bd_contains = bdev;

		bdev->bd_inode->i_flags = 0;



		if (!partno) {

			ret = -ENXIO;
@@ -1303,11 +1299,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
				}

			}



			if (!ret) {

			if (!ret)

				bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);

				if (!bdev_dax_capable(bdev))

					bdev->bd_inode->i_flags &= ~S_DAX;

			}



			/*

			 * If the device is invalidated, rescan partition
@@ -1342,8 +1335,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
				goto out_clear;

			}

			bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9);

			if (!bdev_dax_capable(bdev))

				bdev->bd_inode->i_flags &= ~S_DAX;

		}

	} else {

		if (bdev->bd_contains == bdev) {