VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   32 Branches   54 Tags
author: Brian Geffon <bgeffon@google.com> 2021-04-29 22:57:48 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-04-30 11:20:39 -0700 commit: 14d071134c740cfe61c09fc506fd3ab052beea10 parent: a4609387859f0281951f5e476d9f76d7fb9ab321
Commit Summary:
Revert "mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio"
Diffstat:
1 file changed, 1 insertion, 4 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 1f32da13d39e..76ce0cc3ee4e 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -323,16 +323,13 @@ static void aio_free_ring(struct kioctx *ctx)
 	}
 }
 
-static int aio_ring_mremap(struct vm_area_struct *vma, unsigned long flags)
+static int aio_ring_mremap(struct vm_area_struct *vma)
 {
 	struct file *file = vma->vm_file;
 	struct mm_struct *mm = vma->vm_mm;
 	struct kioctx_table *table;
 	int i, res = -EINVAL;
 
-	if (flags & MREMAP_DONTUNMAP)
-		return -EINVAL;
-
 	spin_lock(&mm->ioctx_lock);
 	rcu_read_lock();
 	table = rcu_dereference(mm->ioctx_table);