Skip to content

Commit 28dc88c

Browse files
apopple-nvidiaakpm00
authored andcommitted
fs/dax: remove FS_DAX_LIMITED config option
The dcssblk driver was the last user of FS_DAX_LIMITED. That was marked broken by 653d782 ("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: Alistair Popple <apopple@nvidia.com> Acked-by: David 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: Andrew Morton <akpm@linux-foundation.org>
1 parent bea0cc7 commit 28dc88c

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

fs/Kconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ endif # BLOCK
5959
config FS_DAX
6060
bool "File system based Direct Access (DAX) support"
6161
depends on MMU
62-
depends on ZONE_DEVICE || FS_DAX_LIMITED
62+
depends on ZONE_DEVICE
6363
select FS_IOMAP
6464
select DAX
6565
help
@@ -95,13 +95,6 @@ config FS_DAX_PMD
9595
depends on ZONE_DEVICE
9696
depends on TRANSPARENT_HUGEPAGE
9797

98-
# Selected by DAX drivers that do not expect filesystem DAX to support
99-
# get_user_pages() of DAX mappings. I.e. "limited" indicates no support
100-
# for fork() of processes with MAP_SHARED mappings or support for
101-
# direct-I/O to a DAX mapping.
102-
config FS_DAX_LIMITED
103-
bool
104-
10598
# Posix ACL utility routines
10699
#
107100
# Note: Posix ACLs can be implemented without these helpers. Never use

fs/dax.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,6 @@ static void dax_associate_entry(void *entry, struct address_space *mapping,
449449
if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))
450450
return;
451451

452-
if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))
453-
return;
454-
455452
index = linear_page_index(vma, address & ~(size - 1));
456453
if (shared && (folio->mapping || dax_folio_is_shared(folio))) {
457454
if (folio->mapping)
@@ -474,9 +471,6 @@ static void dax_disassociate_entry(void *entry, struct address_space *mapping,
474471
{
475472
struct folio *folio = dax_to_folio(entry);
476473

477-
if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))
478-
return;
479-
480474
if (dax_is_zero_entry(entry) || dax_is_empty_entry(entry))
481475
return;
482476

@@ -768,12 +762,6 @@ struct page *dax_layout_busy_page_range(struct address_space *mapping,
768762
pgoff_t end_idx;
769763
XA_STATE(xas, &mapping->i_pages, start_idx);
770764

771-
/*
772-
* In the 'limited' case get_user_pages() for dax is disabled.
773-
*/
774-
if (IS_ENABLED(CONFIG_FS_DAX_LIMITED))
775-
return NULL;
776-
777765
if (!dax_mapping(mapping))
778766
return NULL;
779767

mm/memremap.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,6 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid)
332332
}
333333
break;
334334
case MEMORY_DEVICE_FS_DAX:
335-
if (IS_ENABLED(CONFIG_FS_DAX_LIMITED)) {
336-
WARN(1, "File system DAX not supported\n");
337-
return ERR_PTR(-EINVAL);
338-
}
339335
params.pgprot = pgprot_decrypted(params.pgprot);
340336
break;
341337
case MEMORY_DEVICE_GENERIC:

0 commit comments

Comments
 (0)