From ecb36ecea3d98ab53ce0135c3cbcb929b5cd318f Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 31 May 2012 13:39:05 +0200 Subject: [PATCH] --- yaml --- r: 309618 b: refs/heads/master c: 3c9c708c9fc967e389f85bc735e4c1f65d67334e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-ioc.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c8cddef6a5e7..d4eade2e8b49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b77874c9699522540e65aa4291e37a7e43533bf3 +refs/heads/master: 3c9c708c9fc967e389f85bc735e4c1f65d67334e diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c index 1e2d53b04858..893b8007c657 100644 --- a/trunk/block/blk-ioc.c +++ b/trunk/block/blk-ioc.c @@ -235,6 +235,7 @@ void ioc_clear_queue(struct request_queue *q) int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node) { struct io_context *ioc; + int ret; ioc = kmem_cache_alloc_node(iocontext_cachep, gfp_flags | __GFP_ZERO, node); @@ -262,9 +263,12 @@ int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node) task->io_context = ioc; else kmem_cache_free(iocontext_cachep, ioc); + + ret = task->io_context ? 0 : -EBUSY; + task_unlock(task); - return 0; + return ret; } /**