diff --git a/[refs] b/[refs] index 7b3d6e5b77da..721b5e69e794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f14d792f9a8fede64ce918dbb517f934497a4f8 +refs/heads/master: 50eaeb323a170e231263ccb433bb2f99bd9e27ac diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 286008cf889e..0f3eb70f9ce1 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -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