Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8

[linux-2.6-block.git] / block / blk-cgroup.c

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index cafcd743118969daec377f52f09e41594d188347..6ce36ff98a41f10f3b59d4d9be96deb59aa7f57b 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -600,7 +600,7 @@ struct cftype blkcg_files[] = {
  *
  * This is the blkcg counterpart of ioc_release_fn().
  */
-static int blkcg_pre_destroy(struct cgroup *cgroup)
+static void blkcg_pre_destroy(struct cgroup *cgroup)
 {
        struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
 
@@ -622,7 +622,6 @@ static int blkcg_pre_destroy(struct cgroup *cgroup)
        }
 
        spin_unlock_irq(&blkcg->lock);
-       return 0;
 }
 
 static void blkcg_destroy(struct cgroup *cgroup)