openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: rename the return of two functions 

If we rename the return of alloc_io_context() and get_io_context() from
"ret" to "ioc" the code get's (a bit) more readable and (a lot) more
grepable.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Paul Bolle 2011-06-06 05:11:34 +02:00 committed by Jens Axboe
parent 8aea45451b
commit df4156569d
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
block/blk-ioc.c
View File

@ -82,26 +82,26 @@ void exit_io_context(struct task_struct *task)
struct io_context *alloc_io_context(gfp_t gfp_flags, int node) struct io_context *alloc_io_context(gfp_t gfp_flags, int node)
{ {
struct io_context *ret; struct io_context *ioc;
ret = kmem_cache_alloc_node(iocontext_cachep, gfp_flags, node); ioc = kmem_cache_alloc_node(iocontext_cachep, gfp_flags, node);
if (ret) { if (ioc) {
atomic_long_set(&ret->refcount, 1); atomic_long_set(&ioc->refcount, 1);
atomic_set(&ret->nr_tasks, 1); atomic_set(&ioc->nr_tasks, 1);
spin_lock_init(&ret->lock); spin_lock_init(&ioc->lock);
ret->ioprio_changed = 0; ioc->ioprio_changed = 0;
ret->ioprio = 0; ioc->ioprio = 0;
ret->last_waited = 0; /* doesn't matter... */ ioc->last_waited = 0; /* doesn't matter... */
ret->nr_batch_requests = 0; /* because this is 0 */ ioc->nr_batch_requests = 0; /* because this is 0 */
INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH); INIT_RADIX_TREE(&ioc->radix_root, GFP_ATOMIC | __GFP_HIGH);
INIT_HLIST_HEAD(&ret->cic_list); INIT_HLIST_HEAD(&ioc->cic_list);
ret->ioc_data = NULL; ioc->ioc_data = NULL;
#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE) #if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
ret->cgroup_changed = 0; ioc->cgroup_changed = 0;
#endif #endif
} }
return ret; return ioc;
} }
/* /*
@ -139,19 +139,19 @@ struct io_context *current_io_context(gfp_t gfp_flags, int node)
*/ */
struct io_context *get_io_context(gfp_t gfp_flags, int node) struct io_context *get_io_context(gfp_t gfp_flags, int node)
{ {
struct io_context *ret = NULL; struct io_context *ioc = NULL;
/* /*
* Check for unlikely race with exiting task. ioc ref count is * Check for unlikely race with exiting task. ioc ref count is
* zero when ioc is being detached. * zero when ioc is being detached.
*/ */
do { do {
ret = current_io_context(gfp_flags, node); ioc = current_io_context(gfp_flags, node);
if (unlikely(!ret)) if (unlikely(!ioc))
break; break;
} while (!atomic_long_inc_not_zero(&ret->refcount)); } while (!atomic_long_inc_not_zero(&ioc->refcount));
return ret; return ioc;
} }
EXPORT_SYMBOL(get_io_context); EXPORT_SYMBOL(get_io_context);