diff options
author | Dmitry Monakhov <dmonakhov@openvz.org> | 2010-04-28 13:50:33 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-28 13:51:38 -0400 |
commit | 50eaeb323a170e231263ccb433bb2f99bd9e27ac (patch) | |
tree | 44965684ed3e5d7469d2038ebbf44e3062367499 /block/cfq-iosched.c | |
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>
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 286008cf889e..0f3eb70f9ce1 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1094,7 +1094,7 @@ static struct cfq_group *cfq_get_cfqg(struct cfq_data *cfqd, int create) | |||
1094 | 1094 | ||
1095 | static inline struct cfq_group *cfq_ref_get_cfqg(struct cfq_group *cfqg) | 1095 | static inline struct cfq_group *cfq_ref_get_cfqg(struct cfq_group *cfqg) |
1096 | { | 1096 | { |
1097 | return NULL; | 1097 | return cfqg; |
1098 | } | 1098 | } |
1099 | 1099 | ||
1100 | static inline void | 1100 | static inline void |