summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-03-10 23:14:05 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-03-20 21:29:39 -0400
commit9fa1cb397fa052fc9acfaf5a9f2faff31e10f6b7 (patch)
tree4dfb32cac8ef67c312dec2e0232816913c6cc447 /fs
parent2dd542b7aeb1c222273cf0593a718d9b44998d9f (diff)
aio: aio_nr_lock is taken only synchronously now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 216eb37b2c76..9c3de88e2ead 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -278,14 +278,14 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
goto out_freectx;
/* limit the number of system wide aios */
- spin_lock_bh(&aio_nr_lock);
+ spin_lock(&aio_nr_lock);
if (aio_nr + nr_events > aio_max_nr ||
aio_nr + nr_events < aio_nr) {
- spin_unlock_bh(&aio_nr_lock);
+ spin_unlock(&aio_nr_lock);
goto out_cleanup;
}
aio_nr += ctx->max_reqs;
- spin_unlock_bh(&aio_nr_lock);
+ spin_unlock(&aio_nr_lock);
/* now link into global list. */
spin_lock(&mm->ioctx_lock);