From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753581AbcG2SXY (ORCPT ); Fri, 29 Jul 2016 14:23:24 -0400 Received: from mga14.intel.com ([192.55.52.115]:61886 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372AbcG2SXX (ORCPT ); Fri, 29 Jul 2016 14:23:23 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,440,1464678000"; d="scan'208";a="1026409094" From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , Andrew Morton , Dan Williams , Jens Axboe , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nvdimm@ml01.01.org, Dave Hansen Subject: [PATCH] block: remove BLK_DEV_DAX config option Date: Fri, 29 Jul 2016 12:23:14 -0600 Message-Id: <20160729182314.6368-1-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.9.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Dave Hansen Cc: Dan Williams --- block/Kconfig | 13 ------------- fs/block_dev.c | 5 +---- 2 files changed, 1 insertion(+), 17 deletions(-) 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; -- 2.9.0