aboutsummaryrefslogtreecommitdiffstats
path: root/mm/filemap.c
diff options
context:
space:
mode:
authorAmir Goldstein <[email protected]>2025-03-12 07:38:52 +0000
committerJan Kara <[email protected]>2025-03-13 15:31:12 +0000
commit252256e416deb255607f0c4a69e7cfec079e5d61 (patch)
tree89fddcb3b822b828c6ad5bbf03fdce69f1613f8f /mm/filemap.c
parentRevert "mm: don't allow huge faults for files with pre content watches" (diff)
downloadkernel-252256e416deb255607f0c4a69e7cfec079e5d61.tar.gz
kernel-252256e416deb255607f0c4a69e7cfec079e5d61.zip
Revert "fanotify: disable readahead if we have pre-content watches"
This reverts commit fac84846a28c0950d4433118b3dffd44306df62d. Signed-off-by: Amir Goldstein <[email protected]> Signed-off-by: Jan Kara <[email protected]> Link: https://patch.msgid.link/[email protected]
Diffstat (limited to 'mm/filemap.c')
-rw-r--r--mm/filemap.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index ff5fcdd96136..6d616bb9001e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3197,14 +3197,6 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf)
unsigned long vm_flags = vmf->vma->vm_flags;
unsigned int mmap_miss;
- /*
- * If we have pre-content watches we need to disable readahead to make
- * sure that we don't populate our mapping with 0 filled pages that we
- * never emitted an event for.
- */
- if (unlikely(FMODE_FSNOTIFY_HSM(file->f_mode)))
- return fpin;
-
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
/* Use the readahead code, even if readahead is disabled */
if ((vm_flags & VM_HUGEPAGE) && HPAGE_PMD_ORDER <= MAX_PAGECACHE_ORDER) {
@@ -3273,10 +3265,6 @@ static struct file *do_async_mmap_readahead(struct vm_fault *vmf,
struct file *fpin = NULL;
unsigned int mmap_miss;
- /* See comment in do_sync_mmap_readahead. */
- if (unlikely(FMODE_FSNOTIFY_HSM(file->f_mode)))
- return fpin;
-
/* If we don't want any read-ahead, don't bother */
if (vmf->vma->vm_flags & VM_RAND_READ || !ra->ra_pages)
return fpin;