| 1 |
commit: f524fc9b507bf571b26d986e5f2468313c99540b |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Feb 11 16:28:28 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 20:15:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f524fc9b |
| 7 |
|
| 8 |
sys-kernel/aufs-sources: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3915 |
| 11 |
|
| 12 |
.../files/aufs-sources-3.10.26-mmap-aufs3.patch | 38 ---------------------- |
| 13 |
.../files/aufs-sources-3.12.7-mmap-aufs3.patch | 38 ---------------------- |
| 14 |
2 files changed, 76 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch b/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 48f4da5ac7..0000000000 |
| 19 |
--- a/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,38 +0,0 @@ |
| 22 |
- aufs3-mmap.patch | 17 ++++++----------- |
| 23 |
- 1 file changed, 6 insertions(+), 11 deletions(-) |
| 24 |
- |
| 25 |
-diff --git a/aufs3-mmap.patch b/aufs3-mmap.patch |
| 26 |
-index 398253b..d9b413c 100644 |
| 27 |
---- a/aufs3-mmap.patch |
| 28 |
-+++ b/aufs3-mmap.patch |
| 29 |
-@@ -215,24 +215,19 @@ index 7905fe7..94cc777 100644 |
| 30 |
- if (page->mapping != inode->i_mapping) { |
| 31 |
- unlock_page(page); |
| 32 |
- diff --git a/mm/fremap.c b/mm/fremap.c |
| 33 |
--index 87da359..92bb6f2 100644 |
| 34 |
-+index bbc4d66..7deee2c 100644 |
| 35 |
- --- a/mm/fremap.c |
| 36 |
- +++ b/mm/fremap.c |
| 37 |
--@@ -202,11 +202,12 @@ get_write_lock: |
| 38 |
-- */ |
| 39 |
-- if (mapping_cap_account_dirty(mapping)) { |
| 40 |
-- unsigned long addr; |
| 41 |
--- struct file *file = get_file(vma->vm_file); |
| 42 |
--+ struct file *file = vma->vm_file; |
| 43 |
-+@@ -211,7 +211,9 @@ get_write_lock: |
| 44 |
-+ /* mmap_region may free vma; grab the info now */ |
| 45 |
-+ vm_flags = vma->vm_flags; |
| 46 |
- |
| 47 |
- + vma_get_file(vma); |
| 48 |
-- addr = mmap_region(file, start, size, |
| 49 |
-- vma->vm_flags, pgoff); |
| 50 |
--- fput(file); |
| 51 |
-+ addr = mmap_region(file, start, size, vm_flags, pgoff); |
| 52 |
- + vma_fput(vma); |
| 53 |
-+ fput(file); |
| 54 |
- if (IS_ERR_VALUE(addr)) { |
| 55 |
- err = addr; |
| 56 |
-- } else { |
| 57 |
- diff --git a/mm/madvise.c b/mm/madvise.c |
| 58 |
- index 7055883..e6b768d 100644 |
| 59 |
- --- a/mm/madvise.c |
| 60 |
|
| 61 |
diff --git a/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch b/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch |
| 62 |
deleted file mode 100644 |
| 63 |
index b4f7335a91..0000000000 |
| 64 |
--- a/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch |
| 65 |
+++ /dev/null |
| 66 |
@@ -1,38 +0,0 @@ |
| 67 |
- aufs3-mmap.patch | 17 ++++++----------- |
| 68 |
- 1 file changed, 6 insertions(+), 11 deletions(-) |
| 69 |
- |
| 70 |
-diff --git a/aufs3-mmap.patch b/aufs3-mmap.patch |
| 71 |
-index acebfa8..8682a6d 100644 |
| 72 |
---- a/aufs3-mmap.patch |
| 73 |
-+++ b/aufs3-mmap.patch |
| 74 |
-@@ -215,24 +215,19 @@ index ae4846f..3f890ee 100644 |
| 75 |
- if (page->mapping != inode->i_mapping) { |
| 76 |
- unlock_page(page); |
| 77 |
- diff --git a/mm/fremap.c b/mm/fremap.c |
| 78 |
--index 5bff081..246a9c7 100644 |
| 79 |
-+index bbc4d66..7deee2c 100644 |
| 80 |
- --- a/mm/fremap.c |
| 81 |
- +++ b/mm/fremap.c |
| 82 |
--@@ -207,11 +207,12 @@ get_write_lock: |
| 83 |
-- */ |
| 84 |
-- if (mapping_cap_account_dirty(mapping)) { |
| 85 |
-- unsigned long addr; |
| 86 |
--- struct file *file = get_file(vma->vm_file); |
| 87 |
--+ struct file *file = vma->vm_file; |
| 88 |
-+@@ -211,7 +211,9 @@ get_write_lock: |
| 89 |
-+ /* mmap_region may free vma; grab the info now */ |
| 90 |
-+ vm_flags = vma->vm_flags; |
| 91 |
- |
| 92 |
- + vma_get_file(vma); |
| 93 |
-- addr = mmap_region(file, start, size, |
| 94 |
-- vma->vm_flags, pgoff); |
| 95 |
--- fput(file); |
| 96 |
-+ addr = mmap_region(file, start, size, vm_flags, pgoff); |
| 97 |
- + vma_fput(vma); |
| 98 |
-+ fput(file); |
| 99 |
- if (IS_ERR_VALUE(addr)) { |
| 100 |
- err = addr; |
| 101 |
-- } else { |
| 102 |
- diff --git a/mm/madvise.c b/mm/madvise.c |
| 103 |
- index 539eeb9..5e700b1 100644 |
| 104 |
- --- a/mm/madvise.c |
Archives