| commit | 50eaeb323a170e231263ccb433bb2f99bd9e27ac | [log] [tgz] |
|---|---|---|
| author | Dmitry Monakhov <dmonakhov@openvz.org> | Wed Apr 28 19:50:33 2010 +0200 |
| committer | Jens Axboe <jens.axboe@oracle.com> | Wed Apr 28 19:51:38 2010 +0200 |
| tree | 44965684ed3e5d7469d2038ebbf44e3062367499 | |
| parent | 3f14d792f9a8fede64ce918dbb517f934497a4f8 [diff] |
cfq-iosched: fix broken cfq_ref_get_cfqf() for CONFIG_BLK_CGROUP=y && CFQ_GROUP_IOSCHED=n We should return the cfq_group for this case, not NULL. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 286008c..0f3eb70 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c
@@ -1094,7 +1094,7 @@ static inline struct cfq_group *cfq_ref_get_cfqg(struct cfq_group *cfqg) { - return NULL; + return cfqg; } static inline void