fix build warning in hugetlbfs

diff --git a/queue-4.14/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch b/queue-4.14/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
index 1a3db9d9a1210c6d695a0df7c749cfc4b9a8d0ce..81468edbbf292fe432b58015860e0f1eb0b6f80a 100644 (file)
--- a/queue-4.14/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
+++ b/queue-4.14/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
@@ -64,11 +64,11 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- fs/hugetlbfs/inode.c    |    7 ++-----
+ fs/hugetlbfs/inode.c    |    8 ++------
  include/linux/hugetlb.h |    4 +---
  mm/hugetlb.c            |   23 +++++++----------------
  mm/userfaultfd.c        |    3 +--
- 4 files changed, 11 insertions(+), 26 deletions(-)
+ 4 files changed, 11 insertions(+), 27 deletions(-)
 
 --- a/fs/hugetlbfs/inode.c
 +++ b/fs/hugetlbfs/inode.c
@@ -83,7 +83,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        mutex_lock(&hugetlb_fault_mutex_table[hash]);
  
                        /*
-@@ -621,8 +619,7 @@ static long hugetlbfs_fallocate(struct f
+@@ -557,7 +555,6 @@ static long hugetlbfs_fallocate(struct f
+       struct address_space *mapping = inode->i_mapping;
+       struct hstate *h = hstate_inode(inode);
+       struct vm_area_struct pseudo_vma;
+-      struct mm_struct *mm = current->mm;
+       loff_t hpage_size = huge_page_size(h);
+       unsigned long hpage_shift = huge_page_shift(h);
+       pgoff_t start, index, end;
+@@ -621,8 +618,7 @@ static long hugetlbfs_fallocate(struct f
                addr = index * hpage_size;
  
                /* mutex taken here, fault path and hole punch */

diff --git a/queue-4.4/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch b/queue-4.4/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
index 793d7c23c394470e824d773ec9f69a4e9e9e484d..5e4645aacfb37e1660ab6c8adfae09bea829d331 100644 (file)
--- a/queue-4.4/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
+++ b/queue-4.4/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
@@ -65,10 +65,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 
 ---
- fs/hugetlbfs/inode.c    |    7 ++-----
+ fs/hugetlbfs/inode.c    |    8 ++------
  include/linux/hugetlb.h |    4 +---
  mm/hugetlb.c            |   19 +++++--------------
- 3 files changed, 8 insertions(+), 22 deletions(-)
+ 3 files changed, 8 insertions(+), 23 deletions(-)
 
 --- a/fs/hugetlbfs/inode.c
 +++ b/fs/hugetlbfs/inode.c
@@ -83,7 +83,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        mutex_lock(&hugetlb_fault_mutex_table[hash]);
  
                        lock_page(page);
-@@ -633,8 +631,7 @@ static long hugetlbfs_fallocate(struct f
+@@ -569,7 +567,6 @@ static long hugetlbfs_fallocate(struct f
+       struct address_space *mapping = inode->i_mapping;
+       struct hstate *h = hstate_inode(inode);
+       struct vm_area_struct pseudo_vma;
+-      struct mm_struct *mm = current->mm;
+       loff_t hpage_size = huge_page_size(h);
+       unsigned long hpage_shift = huge_page_shift(h);
+       pgoff_t start, index, end;
+@@ -633,8 +630,7 @@ static long hugetlbfs_fallocate(struct f
                addr = index * hpage_size;
  
                /* mutex taken here, fault path and hole punch */

diff --git a/queue-4.9/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch b/queue-4.9/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
index b901f624af441b9d673dc045a673958698714b26..7201071a83fc023f0560c18814603f93ad40a779 100644 (file)
--- a/queue-4.9/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
+++ b/queue-4.9/hugetlb-use-same-fault-hash-key-for-shared-and-private-mappings.patch
@@ -64,10 +64,10 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- fs/hugetlbfs/inode.c    |    7 ++-----
+ fs/hugetlbfs/inode.c    |    8 ++------
  include/linux/hugetlb.h |    4 +---
  mm/hugetlb.c            |   19 +++++--------------
- 3 files changed, 8 insertions(+), 22 deletions(-)
+ 3 files changed, 8 insertions(+), 23 deletions(-)
 
 --- a/fs/hugetlbfs/inode.c
 +++ b/fs/hugetlbfs/inode.c
@@ -82,7 +82,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        mutex_lock(&hugetlb_fault_mutex_table[hash]);
  
                        /*
-@@ -637,8 +635,7 @@ static long hugetlbfs_fallocate(struct f
+@@ -573,7 +571,6 @@ static long hugetlbfs_fallocate(struct f
+       struct address_space *mapping = inode->i_mapping;
+       struct hstate *h = hstate_inode(inode);
+       struct vm_area_struct pseudo_vma;
+-      struct mm_struct *mm = current->mm;
+       loff_t hpage_size = huge_page_size(h);
+       unsigned long hpage_shift = huge_page_shift(h);
+       pgoff_t start, index, end;
+@@ -637,8 +634,7 @@ static long hugetlbfs_fallocate(struct f
                addr = index * hpage_size;
  
                /* mutex taken here, fault path and hole punch */