diff options
Diffstat (limited to 'fs/userfaultfd.c')
| -rw-r--r-- | fs/userfaultfd.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index fe6d804a38dc..0c98d376d246 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -911,8 +911,10 @@ static int userfaultfd_release(struct inode *inode, struct file *file) prev = vma_merge(mm, prev, vma->vm_start, vma->vm_end, new_flags, vma->anon_vma, vma->vm_file, vma->vm_pgoff, - vma_policy(vma), - NULL_VM_UFFD_CTX); + vma_policy(vma), + NULL_VM_UFFD_CTX, + vma_get_anon_name(vma)); + if (prev) vma = prev; else @@ -1462,7 +1464,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; @@ -1624,7 +1627,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; |