Commit 28dc88c3 authored by Alistair Popple's avatar Alistair Popple Committed by Andrew Morton
Browse files

fs/dax: remove FS_DAX_LIMITED config option 

The dcssblk driver was the last user of FS_DAX_LIMITED.  That was marked
broken by 653d7825 ("dcssblk: mark DAX broken, remove FS_DAX_LIMITED
support") to allow removal of PFN_SPECIAL.  However the FS_DAX_LIMITED
config option itself was not removed, so do that now.

Link: https://lkml.kernel.org/r/b47bf164b4a1013d736fa1a3d501bc8b8e71311f.1750323463.git-series.apopple@nvidia.com


Signed-off-by: default avatarAlistair Popple <apopple@nvidia.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Balbir Singh <balbirs@nvidia.com>
Cc: Björn Töpel <bjorn@kernel.org>
Cc: Björn Töpel <bjorn@rivosinc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chunyan Zhang <zhang.lyra@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Deepak Gupta <debug@rivosinc.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Inki Dae <m.szyprowski@samsung.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: John Groves <john@groves.net>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bea0cc7c

fs/Kconfig

+1 −8
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ endif # BLOCK 
config FS_DAX

	bool "File system based Direct Access (DAX) support"

	depends on MMU

	depends on ZONE_DEVICE || FS_DAX_LIMITED

	depends on ZONE_DEVICE

	select FS_IOMAP

	select DAX

	help
@@ -95,13 +95,6 @@ config FS_DAX_PMD 
	depends on ZONE_DEVICE

	depends on TRANSPARENT_HUGEPAGE



# Selected by DAX drivers that do not expect filesystem DAX to support

# get_user_pages() of DAX mappings. I.e. "limited" indicates no support

# for fork() of processes with MAP_SHARED mappings or support for

# direct-I/O to a DAX mapping.

config FS_DAX_LIMITED

	bool



# Posix ACL utility routines

#

# Note: Posix ACLs can be implemented without these helpers.  Never use

fs/dax.c

+0 −12
Original line number Diff line number Diff line
@@ -449,9 +449,6 @@ static void dax_associate_entry(void *entry, struct address_space *mapping, 
	if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))

		return;



	if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))

		return;



	index = linear_page_index(vma, address & ~(size - 1));

	if (shared && (folio->mapping || dax_folio_is_shared(folio))) {

		if (folio->mapping)
@@ -474,9 +471,6 @@ static void dax_disassociate_entry(void *entry, struct address_space *mapping, 
{

	struct folio *folio = dax_to_folio(entry);



	if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))

		return;



	if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))

		return;
@@ -768,12 +762,6 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping, 
	pgoff_t end_idx;

	XA_STATE(xas, &mapping->i_pages, start_idx);



	/*

	 * In the 'limited' case get_user_pages() for dax is disabled.

	 */

	if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))

		return NULL;



	if (!dax_mapping(mapping))

		return NULL;

mm/memremap.c

+0 −4
Original line number Diff line number Diff line
@@ -332,10 +332,6 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) 
		}

		break;

	case MEMORY_DEVICE_FS_DAX:

		if (IS_ENABLED(CONFIG_FS_DAX_LIMITED)) {

			WARN(1, "File system DAX not supported\n");

			return ERR_PTR(-EINVAL);

		}

		params.pgprot = pgprot_decrypted(params.pgprot);

		break;

	case MEMORY_DEVICE_GENERIC: