ata: ahci: Rename board_ahci_mobile

[linux-2.6-microblaze.git] / block / bfq-cgroup.c

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 85b8e1c..24a5c53 100644 (file)
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -6,13 +6,13 @@
 #include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/cgroup.h>
-#include <linux/elevator.h>
 #include <linux/ktime.h>
 #include <linux/rbtree.h>
 #include <linux/ioprio.h>
 #include <linux/sbitmap.h>
 #include <linux/delay.h>
 
+#include "elevator.h"
 #include "bfq-iosched.h"
 
 #ifdef CONFIG_BFQ_CGROUP_DEBUG
@@ -463,7 +463,7 @@ static int bfqg_stats_init(struct bfqg_stats *stats, gfp_t gfp)
 {
        if (blkg_rwstat_init(&stats->bytes, gfp) ||
            blkg_rwstat_init(&stats->ios, gfp))
-               return -ENOMEM;
+               goto error;
 
 #ifdef CONFIG_BFQ_CGROUP_DEBUG
        if (blkg_rwstat_init(&stats->merged, gfp) ||
@@ -476,13 +476,15 @@ static int bfqg_stats_init(struct bfqg_stats *stats, gfp_t gfp)
            bfq_stat_init(&stats->dequeue, gfp) ||
            bfq_stat_init(&stats->group_wait_time, gfp) ||
            bfq_stat_init(&stats->idle_time, gfp) ||
-           bfq_stat_init(&stats->empty_time, gfp)) {
-               bfqg_stats_exit(stats);
-               return -ENOMEM;
-       }
+           bfq_stat_init(&stats->empty_time, gfp))
+               goto error;
 #endif
 
        return 0;
+
+error:
+       bfqg_stats_exit(stats);
+       return -ENOMEM;
 }
 
 static struct bfq_group_data *cpd_to_bfqgd(struct blkcg_policy_data *cpd)