cfq-iosched: fix broken cfq_ref_get_cfqf() for CONFIG_BLK_CGROUP=y && CFQ_GROUP_IOSCHED=n
authorDmitry Monakhov <dmonakhov@openvz.org>
Wed, 28 Apr 2010 17:50:33 +0000 (19:50 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 28 Apr 2010 17:51:38 +0000 (19:51 +0200)
We should return the cfq_group for this case, not NULL.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/cfq-iosched.c

index 286008cf889ed2f4d00ff391ec3a66e269dfcf46..0f3eb70f9ce192bd3554c05e2efc29d6c11eeb1c 100644 (file)
@@ -1094,7 +1094,7 @@ static struct cfq_group *cfq_get_cfqg(struct cfq_data *cfqd, int create)
 
 static inline struct cfq_group *cfq_ref_get_cfqg(struct cfq_group *cfqg)
 {
-       return NULL;
+       return cfqg;
 }
 
 static inline void