-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
aufs mmap patches for k6.1 & k6.6 (#4329)
* Add 6.1 & 6.6 patches 6.6 should be temporary * Update apply 6.1 & 6.6 patches 6.6 should be temporary
- Loading branch information
Showing
3 changed files
with
50 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- aufs6-mmap.patch.orig 2024-11-30 11:59:55.826601709 +0000 | ||
+++ aufs6-mmap.patch 2024-11-30 11:57:13.876603849 +0000 | ||
@@ -237,9 +237,9 @@ | ||
vma = merge; | ||
/* Update vm_flags to pick up the change. */ | ||
@@ -2746,7 +2746,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, | ||
- if (vma->vm_ops && vma->vm_ops->close) | ||
- vma->vm_ops->close(vma); | ||
- unmap_and_free_vma: | ||
+ return addr; | ||
+ | ||
+ unmap_and_free_file_vma: | ||
- fput(vma->vm_file); | ||
+ vma_fput(vma); | ||
vma->vm_file = NULL; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
--- aufs6-mmap.patch.orig 2024-11-30 12:04:39.029931230 +0000 | ||
+++ aufs6-mmap.patch 2024-11-30 11:42:03.209949373 +0000 | ||
@@ -219,14 +219,14 @@ | ||
vma = merge; | ||
/* Update vm_flags to pick up the change. */ | ||
@@ -2904,7 +2904,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, | ||
+ return addr; | ||
|
||
- if (file || vma->vm_file) { | ||
- unmap_and_free_vma: | ||
-- fput(vma->vm_file); | ||
-+ vma_fput(vma); | ||
- vma->vm_file = NULL; | ||
+ unmap_and_free_file_vma: | ||
+- fput(vma->vm_file); | ||
++ vma_fput(vma); | ||
+ vma->vm_file = NULL; | ||
|
||
- vma_iter_set(&vmi, vma->vm_end); | ||
+ vma_iter_set(&vmi, vma->vm_end); | ||
@@ -2966,6 +2966,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, | ||
unsigned long populate = 0; | ||
unsigned long ret = -EINVAL; |