projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag '5.13-rc-smb3-part3' of git://git.samba.org/sfrench/cifs-2.6
[linux-2.6-microblaze.git]
/
fs
/
aio.c
diff --git
a/fs/aio.c
b/fs/aio.c
index
1f32da1
..
76ce0cc
100644
(file)
--- 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;
{
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);
spin_lock(&mm->ioctx_lock);
rcu_read_lock();
table = rcu_dereference(mm->ioctx_table);