2 files changed, 1 insertions, 18 deletions

diff --git a/block/Kconfig b/block/Kconfig
index 0363cd731320..161491d0a879 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -88,19 +88,6 @@ config BLK_DEV_INTEGRITY
         T10/SCSI Data Integrity Field or the T13/ATA External Path
         Protection.  If in doubt, say N.
 
-config BLK_DEV_DAX
-        bool "Block device DAX support"
-        depends on FS_DAX
-        depends on BROKEN
-        help
-          When DAX support is available (CONFIG_FS_DAX) raw block
-          devices can also support direct userspace access to the
-          storage capacity via MMAP(2) similar to a file on a
-          DAX-enabled filesystem.  However, the DAX I/O-path disables
-          some standard I/O-statistics, and the MMAP(2) path has some
-          operational differences due to bypassing the page
-          cache.  If in doubt, say N.
-
 config BLK_DEV_THROTTLING
         bool "Block layer bio throttling support"
         depends on BLK_CGROUP=y
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;