Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / block / blk-ioc.c

diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 3c7a339fe3813483155f31b05ea5aa5cd3224a36..b791022beef3158ba02a739c061838bf57500bf5 100644 (file)
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -64,7 +64,7 @@ static void cfq_exit(struct io_context *ioc)
        rcu_read_unlock();
 }
 
-/* Called by the exitting task */
+/* Called by the exiting task */
 void exit_io_context(struct task_struct *task)
 {
        struct io_context *ioc;
@@ -74,10 +74,9 @@ void exit_io_context(struct task_struct *task)
        task->io_context = NULL;
        task_unlock(task);
 
-       if (atomic_dec_and_test(&ioc->nr_tasks)) {
+       if (atomic_dec_and_test(&ioc->nr_tasks))
                cfq_exit(ioc);
 
-       }
        put_io_context(ioc);
 }