From: Dmitry Shmidt <dimitrysh@google.com>
Date: Mon, 28 Dec 2015 18:53:45 +0000 (-0800)
Subject: userfaultfd: Add missing vma_merge parameter
X-Git-Tag: firefly_0821_release~2958^2~99
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c30578d48a9b2465f9fac505c59b5019d0d1eb58;p=firefly-linux-kernel-4.4.55.git

userfaultfd: Add missing vma_merge parameter

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---

diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 50311703135b..68a62457e685 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -451,7 +451,8 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
 				 new_flags, vma->anon_vma,
 				 vma->vm_file, vma->vm_pgoff,
 				 vma_policy(vma),
-				 NULL_VM_UFFD_CTX);
+				 NULL_VM_UFFD_CTX,
+				 vma_get_anon_name(vma));
 		if (prev)
 			vma = prev;
 		else
@@ -827,7 +828,8 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
 		prev = vma_merge(mm, prev, start, vma_end, new_flags,
 				 vma->anon_vma, vma->vm_file, vma->vm_pgoff,
 				 vma_policy(vma),
-				 ((struct vm_userfaultfd_ctx){ ctx }));
+				 ((struct vm_userfaultfd_ctx){ ctx }),
+				 vma_get_anon_name(vma));
 		if (prev) {
 			vma = prev;
 			goto next;
@@ -961,7 +963,8 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
 		prev = vma_merge(mm, prev, start, vma_end, new_flags,
 				 vma->anon_vma, vma->vm_file, vma->vm_pgoff,
 				 vma_policy(vma),
-				 NULL_VM_UFFD_CTX);
+				 NULL_VM_UFFD_CTX,
+				 vma_get_anon_name(vma));
 		if (prev) {
 			vma = prev;
 			goto next;