mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into aio-base
This commit is contained in:
commit
ed0d523adb
26 changed files with 153 additions and 120 deletions
7
fs/aio.c
7
fs/aio.c
|
|
@ -639,9 +639,8 @@ static void free_ioctx_users(struct percpu_ref *ref)
|
|||
while (!list_empty(&ctx->active_reqs)) {
|
||||
req = list_first_entry(&ctx->active_reqs,
|
||||
struct aio_kiocb, ki_list);
|
||||
|
||||
list_del_init(&req->ki_list);
|
||||
kiocb_cancel(req);
|
||||
list_del_init(&req->ki_list);
|
||||
}
|
||||
|
||||
spin_unlock_irq(&ctx->ctx_lock);
|
||||
|
|
@ -1074,8 +1073,8 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)
|
|||
|
||||
ctx = rcu_dereference(table->table[id]);
|
||||
if (ctx && ctx->user_id == ctx_id) {
|
||||
percpu_ref_get(&ctx->users);
|
||||
ret = ctx;
|
||||
if (percpu_ref_tryget_live(&ctx->users))
|
||||
ret = ctx;
|
||||
}
|
||||
out:
|
||||
rcu_read_unlock();
|
||||
|
|
|
|||
Loading…
Reference in a new issue