diff options
| author | Ross Zwisler | 2016-08-03 13:46:15 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-08-04 08:50:07 -0400 |
| commit | 99a01cdf9d572e91c2805a2b89d459797864e3ca (patch) | |
| tree | a1951f7227a1dccae32544784e6e2bdf91895cf9 /fs/block_dev.c | |
| parent | 57c24b2140437644f33eecdcc9c546bead0b5fbd (diff) | |
block: remove BLK_DEV_DAX config option
The functionality for block device DAX was already removed with commit
acc93d30d7d4 ("Revert "block: enable dax for raw block devices"")
However, we still had a config option hanging around that was always
disabled because it depended on CONFIG_BROKEN. This config option was
introduced in commit 03cdadb04077 ("block: disable block device DAX by
default")
This change reverts that commit, removing the dead config option.
Link: http://lkml.kernel.org/r/20160729182314.6368-1-ross.zwisler@linux.intel.com
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index ada42cf42d06..2033a3f91d58 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1275,11 +1275,7 @@ 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; - if (IS_ENABLED(CONFIG_BLK_DEV_DAX) && - blk_queue_dax(disk->queue)) - bdev->bd_inode->i_flags = S_DAX; - else - bdev->bd_inode->i_flags = 0; + bdev->bd_inode->i_flags = 0; if (!partno) { ret = -ENXIO; |