author: Andrea Arcangeli <aarcange@redhat.com> 2017-02-22 15:42:15 -0800
committer: Linus Torvalds <torvalds@linux-foundation.org> 2017-02-22 16:41:28 -0800
commit: a94720bf821dd63e72176da5f423ba7935dde67d
parent: 8474901a33d8a27958bfa99e78736863abd67874
Commit Summary:
Diffstat:
1 file changed, 4 insertions, 4 deletions
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 71e917387ec3..7e8f0d60718d 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -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