diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index c8ec0227f340095163320a0093c878122eebc79e..216a968eb7859d85abf6459189f227bfdc92e7bd 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -873,12 +873,12 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
 	prev = NULL;
 	for (vma = mm->mmap; vma; vma = vma->vm_next) {
 		userfault_flags = VM_UFFD_MISSING | VM_UFFD_WP;
-#ifdef CONFIG_USERSWAP
-		uswap_release(&userfault_flags);
-#endif
 		cond_resched();
 		BUG_ON(!!vma->vm_userfaultfd_ctx.ctx ^
 		       !!(vma->vm_flags & userfault_flags));
+#ifdef CONFIG_USERSWAP
+		uswap_release(&userfault_flags);
+#endif
 		if (vma->vm_userfaultfd_ctx.ctx != ctx) {
 			prev = vma;
 			continue;