bridge: check brport attr show in brport_show

[pandora-kernel.git] / block / blk-ioc.c

diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index c898049..6f9bbd9 100644 (file)
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -21,7 +21,7 @@ static void cfq_dtor(struct io_context *ioc)
        if (!hlist_empty(&ioc->cic_list)) {
                struct cfq_io_context *cic;
 
-               cic = list_entry(ioc->cic_list.first, struct cfq_io_context,
+               cic = hlist_entry(ioc->cic_list.first, struct cfq_io_context,
                                                                cic_list);
                cic->dtor(ioc);
        }
@@ -57,7 +57,7 @@ static void cfq_exit(struct io_context *ioc)
        if (!hlist_empty(&ioc->cic_list)) {
                struct cfq_io_context *cic;
 
-               cic = list_entry(ioc->cic_list.first, struct cfq_io_context,
+               cic = hlist_entry(ioc->cic_list.first, struct cfq_io_context,
                                                                cic_list);
                cic->exit(ioc);
        }
@@ -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 *ret;
+       struct io_context *ioc;
 
-       ret = kmem_cache_alloc_node(iocontext_cachep, gfp_flags, node);
-       if (ret) {
-               atomic_long_set(&ret->refcount, 1);
-               atomic_set(&ret->nr_tasks, 1);
-               spin_lock_init(&ret->lock);
-               ret->ioprio_changed = 0;
-               ret->ioprio = 0;
-               ret->last_waited = 0; /* doesn't matter... */
-               ret->nr_batch_requests = 0; /* because this is 0 */
-               INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH);
-               INIT_HLIST_HEAD(&ret->cic_list);
-               ret->ioc_data = NULL;
+       ioc = kmem_cache_alloc_node(iocontext_cachep, gfp_flags, node);
+       if (ioc) {
+               atomic_long_set(&ioc->refcount, 1);
+               atomic_set(&ioc->nr_tasks, 1);
+               spin_lock_init(&ioc->lock);
+               ioc->ioprio_changed = 0;
+               ioc->ioprio = 0;
+               ioc->last_waited = 0; /* doesn't matter... */
+               ioc->nr_batch_requests = 0; /* because this is 0 */
+               INIT_RADIX_TREE(&ioc->radix_root, GFP_ATOMIC | __GFP_HIGH);
+               INIT_HLIST_HEAD(&ioc->cic_list);
+               ioc->ioc_data = NULL;
 #if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
-               ret->cgroup_changed = 0;
+               ioc->cgroup_changed = 0;
 #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 *ret = NULL;
+       struct io_context *ioc = NULL;
 
        /*
         * Check for unlikely race with exiting task. ioc ref count is
         * zero when ioc is being detached.
         */
        do {
-               ret = current_io_context(gfp_flags, node);
-               if (unlikely(!ret))
+               ioc = current_io_context(gfp_flags, node);
+               if (unlikely(!ioc))
                        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);