From c73ef047fe8f15e66a0cfc607e95da7d631e8392 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 May 2019 16:15:36 +0200 Subject: [PATCH] fix build warning in hugetlbfs --- ...-hash-key-for-shared-and-private-mappings.patch | 14 +++++++++++--- ...-hash-key-for-shared-and-private-mappings.patch | 14 +++++++++++--- ...-hash-key-for-shared-and-private-mappings.patch | 14 +++++++++++--- 3 files changed, 33 insertions(+), 9 deletions(-) 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 1a3db9d9a1..81468edbbf 100644 --- 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 Signed-off-by: Greg Kroah-Hartman --- - 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 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 793d7c23c3..5e4645aacf 100644 --- 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 --- - 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 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 b901f624af..7201071a83 100644 --- 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 Signed-off-by: Greg Kroah-Hartman --- - 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 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 */ -- 2.39.5