Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a94720bf authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

userfaultfd: use vma_is_anonymous 

Cleanup the vma->vm_ops usage.

Side note: it would be more robust if vma_is_anonymous() would also
check that vm_flags hasn't VM_PFNMAP set.

Link: http://lkml.kernel.org/r/20161216144821.5183-5-aarcange@redhat.com


Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Michael Rapoport <RAPOPORT@il.ibm.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8474901a

fs/userfaultfd.c

+4 −4
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, 


		/* check not compatible vmas */

		ret = -EINVAL;

		if (cur->vm_ops)

		if (!vma_is_anonymous(cur))

			goto out_unlock;



		/*
@@ -855,7 +855,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, 
	do {

		cond_resched();



		BUG_ON(vma->vm_ops);

		BUG_ON(!vma_is_anonymous(vma));

		BUG_ON(vma->vm_userfaultfd_ctx.ctx &&

		       vma->vm_userfaultfd_ctx.ctx != ctx);
@@ -981,7 +981,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, 
		 * provides for more strict behavior to notice

		 * unregistration errors.

		 */

		if (cur->vm_ops)

		if (!vma_is_anonymous(cur))

			goto out_unlock;



		found = true;
@@ -995,7 +995,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, 
	do {

		cond_resched();



		BUG_ON(vma->vm_ops);

		BUG_ON(!vma_is_anonymous(vma));



		/*

		 * Nothing to do: this vma is already registered into this

mm/userfaultfd.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static __always_inline ssize_t __mcopy_atomic(struct mm_struct *dst_mm, 
	 * FIXME: only allow copying on anonymous vmas, tmpfs should

	 * be added.

	 */

	if (dst_vma->vm_ops)

	if (!vma_is_anonymous(dst_vma))

		goto out_unlock;



	/*