Commit fa88b6f8 authored by Benjamin LaHaise's avatar Benjamin LaHaise
Browse files

aio: cleanup: flatten kill_ioctx()



There is no need to have most of the code in kill_ioctx() indented.  Flatten
it.
Signed-off-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
parent fb2d4483
...@@ -730,39 +730,39 @@ static struct kioctx *ioctx_alloc(unsigned nr_events) ...@@ -730,39 +730,39 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
static int kill_ioctx(struct mm_struct *mm, struct kioctx *ctx, static int kill_ioctx(struct mm_struct *mm, struct kioctx *ctx,
struct completion *requests_done) struct completion *requests_done)
{ {
if (!atomic_xchg(&ctx->dead, 1)) { struct kioctx_table *table;
struct kioctx_table *table;
spin_lock(&mm->ioctx_lock); if (atomic_xchg(&ctx->dead, 1))
rcu_read_lock(); return -EINVAL;
table = rcu_dereference(mm->ioctx_table);
WARN_ON(ctx != table->table[ctx->id]);
table->table[ctx->id] = NULL;
rcu_read_unlock();
spin_unlock(&mm->ioctx_lock);
/* percpu_ref_kill() will do the necessary call_rcu() */ spin_lock(&mm->ioctx_lock);
wake_up_all(&ctx->wait); rcu_read_lock();
table = rcu_dereference(mm->ioctx_table);
WARN_ON(ctx != table->table[ctx->id]);
table->table[ctx->id] = NULL;
rcu_read_unlock();
spin_unlock(&mm->ioctx_lock);
/* /* percpu_ref_kill() will do the necessary call_rcu() */
* It'd be more correct to do this in free_ioctx(), after all wake_up_all(&ctx->wait);
* the outstanding kiocbs have finished - but by then io_destroy
* has already returned, so io_setup() could potentially return
* -EAGAIN with no ioctxs actually in use (as far as userspace
* could tell).
*/
aio_nr_sub(ctx->max_reqs);
if (ctx->mmap_size) /*
vm_munmap(ctx->mmap_base, ctx->mmap_size); * It'd be more correct to do this in free_ioctx(), after all
* the outstanding kiocbs have finished - but by then io_destroy
* has already returned, so io_setup() could potentially return
* -EAGAIN with no ioctxs actually in use (as far as userspace
* could tell).
*/
aio_nr_sub(ctx->max_reqs);
ctx->requests_done = requests_done; if (ctx->mmap_size)
percpu_ref_kill(&ctx->users); vm_munmap(ctx->mmap_base, ctx->mmap_size);
return 0;
}
return -EINVAL; ctx->requests_done = requests_done;
percpu_ref_kill(&ctx->users);
return 0;
} }
/* wait_on_sync_kiocb: /* wait_on_sync_kiocb:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment