diff options
Diffstat (limited to 'features/aufs/aufs5-mmap-support.patch')
| -rw-r--r-- | features/aufs/aufs5-mmap-support.patch | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/features/aufs/aufs5-mmap-support.patch b/features/aufs/aufs5-mmap-support.patch index 04420bf9..88cf25d1 100644 --- a/features/aufs/aufs5-mmap-support.patch +++ b/features/aufs/aufs5-mmap-support.patch @@ -1,7 +1,7 @@ -From aef8130125f0bf3d741f77b7132a9ac4c8094cbe Mon Sep 17 00:00:00 2001 +From a2e902a4f19b3b5d3dfab511bdec517b2457ba9c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Wed, 3 Jul 2019 10:55:03 -0400 -Subject: [PATCH 3/5] aufs5: mmap support +Subject: [PATCH] aufs5: mmap support Application of; aufs5-mmap.patch @@ -23,11 +23,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> create mode 100644 mm/prfile.c diff --git a/fs/proc/base.c b/fs/proc/base.c -index 255f6754c70d..2c009be14898 100644 +index ebea9501afb8..dc7edc5f7267 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c -@@ -2014,7 +2014,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) - down_read(&mm->mmap_sem); +@@ -2037,7 +2037,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) + rc = -ENOENT; vma = find_exact_vma(mm, vm_start, vm_end); if (vma && vma->vm_file) { - *path = vma->vm_file->f_path; @@ -52,10 +52,10 @@ index 14c2badb8fd9..65afe5287e43 100644 ino = inode->i_ino; } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index 01d4eb0e6bd1..fedfaa012768 100644 +index 731642e0f5a0..e8d6259de65b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) +@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) const char *name = NULL; if (file) { @@ -67,7 +67,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644 dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; -@@ -1761,7 +1764,7 @@ static int show_numa_map(struct seq_file *m, void *v) +@@ -1807,7 +1810,7 @@ static int show_numa_map(struct seq_file *m, void *v) struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct vm_area_struct *vma = v; struct numa_maps *md = &numa_priv->md; @@ -77,7 +77,7 @@ index 01d4eb0e6bd1..fedfaa012768 100644 struct mm_walk walk = { .hugetlb_entry = gather_hugetlb_stats, diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c -index 36bf0f2e102e..8df6cbc58756 100644 +index 7907e6419e57..d17209cf52bc 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) @@ -93,10 +93,10 @@ index 36bf0f2e102e..8df6cbc58756 100644 ino = inode->i_ino; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; diff --git a/include/linux/mm.h b/include/linux/mm.h -index dd0b5f4e1e45..22030c24191e 100644 +index 0334ca97c584..3bdae823daee 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1553,6 +1553,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, +@@ -1538,6 +1538,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, unmap_mapping_range(mapping, holebegin, holelen, 0); } @@ -126,7 +126,7 @@ index dd0b5f4e1e45..22030c24191e 100644 void *buf, int len, unsigned int gup_flags); extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index 8ec38b11b361..d3f5492a2611 100644 +index 3a37a89eb7a7..cb5e5ebe4dcf 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -253,6 +253,7 @@ struct vm_region { @@ -144,9 +144,9 @@ index 8ec38b11b361..d3f5492a2611 100644 + struct file *vm_prfile; /* shadow of vm_file */ void * vm_private_data; /* was vm_pte (shared mem) */ - atomic_long_t swap_readahead_info; + #ifdef CONFIG_SWAP diff --git a/kernel/fork.c b/kernel/fork.c -index 61667909ce83..d444b5dae73e 100644 +index d8ae0f1b4148..1ce91c08a2b0 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -553,7 +553,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -159,23 +159,23 @@ index 61667909ce83..d444b5dae73e 100644 atomic_dec(&inode->i_writecount); i_mmap_lock_write(mapping); diff --git a/mm/Makefile b/mm/Makefile -index ac5e5ba78874..5decb22d13a0 100644 +index 338e528ad436..ee91e8c78606 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ -- debug.o $(mmu-y) -+ prfile.o debug.o $(mmu-y) +- debug.o gup.o $(mmu-y) ++ prfile.o debug.o gup.o $(mmu-y) # Give 'page_alloc' its own module-parameter namespace page-alloc-y := page_alloc.o diff --git a/mm/filemap.c b/mm/filemap.c -index df2006ba0cfa..d5221dedfe56 100644 +index d0cf700bf201..5cac93e7bf67 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2671,7 +2671,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) +@@ -2721,7 +2721,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) vm_fault_t ret = VM_FAULT_LOCKED; sb_start_pagefault(inode->i_sb); @@ -282,10 +282,10 @@ index 7e8c3e8ae75f..d8a903f61262 100644 new_vma->vm_ops->open(new_vma); vma_link(mm, new_vma, prev, rb_link, rb_parent); diff --git a/mm/nommu.c b/mm/nommu.c -index d8c02fbe03b5..22dae8b7216a 100644 +index fed1b6e9c89b..0d43b248ed54 100644 --- a/mm/nommu.c +++ b/mm/nommu.c -@@ -640,7 +640,7 @@ static void __put_nommu_region(struct vm_region *region) +@@ -552,7 +552,7 @@ static void __put_nommu_region(struct vm_region *region) up_write(&nommu_region_sem); if (region->vm_file) @@ -294,7 +294,7 @@ index d8c02fbe03b5..22dae8b7216a 100644 /* IO memory and memory shared directly out of the pagecache * from ramfs/tmpfs mustn't be released here */ -@@ -778,7 +778,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -690,7 +690,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) @@ -303,7 +303,7 @@ index d8c02fbe03b5..22dae8b7216a 100644 put_nommu_region(vma->vm_region); vm_area_free(vma); } -@@ -1301,7 +1301,7 @@ unsigned long do_mmap(struct file *file, +@@ -1213,7 +1213,7 @@ unsigned long do_mmap(struct file *file, goto error_just_free; } } @@ -312,7 +312,7 @@ index d8c02fbe03b5..22dae8b7216a 100644 kmem_cache_free(vm_region_jar, region); region = pregion; result = start; -@@ -1376,10 +1376,10 @@ unsigned long do_mmap(struct file *file, +@@ -1290,10 +1290,10 @@ unsigned long do_mmap(struct file *file, up_write(&nommu_region_sem); error: if (region->vm_file) |