summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-06-28 08:10:12 -0400
committerTejun Heo <tj@kernel.org>2014-06-28 08:10:12 -0400
commit55c6c814ae0aa896781d3c51e4608de542624f64 (patch)
treed07e2f4d9b5dc9b07d9892cfea9731503fc1bd6b /fs
parent807407c0a29b1e9fe35565f5a671ef3a9dd9f00c (diff)
downloadop-kernel-dev-55c6c814ae0aa896781d3c51e4608de542624f64.zip
op-kernel-dev-55c6c814ae0aa896781d3c51e4608de542624f64.tar.gz
percpu-refcount, aio: use percpu_ref_cancel_init() in ioctx_alloc()
ioctx_alloc() reaches inside percpu_ref and directly frees ->pcpu_count in its failure path, which is quite gross. percpu_ref has been providing a proper interface to do this, percpu_ref_cancel_init(), for quite some time now. Let's use that instead. This patch doesn't introduce any behavior changes. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Benjamin LaHaise <bcrl@kvack.org> Cc: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 4f078c0..5e0d7f9 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -715,8 +715,8 @@ err_ctx:
err:
mutex_unlock(&ctx->ring_lock);
free_percpu(ctx->cpu);
- free_percpu(ctx->reqs.pcpu_count);
- free_percpu(ctx->users.pcpu_count);
+ percpu_ref_cancel_init(&ctx->reqs);
+ percpu_ref_cancel_init(&ctx->users);
kmem_cache_free(kioctx_cachep, ctx);
pr_debug("error allocating ioctx %d\n", err);
return ERR_PTR(err);
OpenPOWER on IntegriCloud