| Message ID | 20160729182314.6368-1-ross.zwisler@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 29, 2016 at 11:23 AM, Ross Zwisler <ross.zwisler@linux.intel.com> wrote: > The functionality for block device DAX was already removed with this > commit: > > 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 this commit: > > commit 03cdadb04077 ("block: disable block device DAX by default") > > This change reverts that commit, removing the dead config option. > > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> > Cc: Dave Hansen <dave.hansen@linux.intel.com> > Cc: Dan Williams <dan.j.williams@intel.com> Acked-by: Dan Williams <dan.j.williams@intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/29/2016 12:23 PM, Ross Zwisler wrote: > The functionality for block device DAX was already removed with this > commit: > > 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 this commit: > > commit 03cdadb04077 ("block: disable block device DAX by default") > > This change reverts that commit, removing the dead config option. This doesn't apply to master, nor for-linus. I hand applied it.
diff --git a/block/Kconfig b/block/Kconfig index 0363cd7..161491d 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 71ccab1..ab7ebee 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1287,10 +1287,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) && disk->fops->direct_access) - bdev->bd_inode->i_flags = S_DAX; - else - bdev->bd_inode->i_flags = 0; + bdev->bd_inode->i_flags = 0; if (!partno) { ret = -ENXIO;
The functionality for block device DAX was already removed with this commit: 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 this commit: commit 03cdadb04077 ("block: disable block device DAX by default") This change reverts that commit, removing the dead config option. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Dan Williams <dan.j.williams@intel.com> --- block/Kconfig | 13 ------------- fs/block_dev.c | 5 +---- 2 files changed, 1 insertion(+), 17 deletions(-)