Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[linux-2.6-microblaze.git] / block / blk-throttle.c

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 80f5481..0fea76a 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -373,10 +373,8 @@ static unsigned int tg_iops_limit(struct throtl_grp *tg, int rw)
        if (likely(!blk_trace_note_message_enabled(__td->queue)))       \
                break;                                                  \
        if ((__tg)) {                                                   \
-               char __pbuf[128];                                       \
-                                                                       \
-               blkg_path(tg_to_blkg(__tg), __pbuf, sizeof(__pbuf));    \
-               blk_add_trace_msg(__td->queue, "throtl %s " fmt, __pbuf, ##args); \
+               blk_add_cgroup_trace_msg(__td->queue,                   \
+                       tg_to_blkg(__tg)->blkcg, "throtl " fmt, ##args);\
        } else {                                                        \
                blk_add_trace_msg(__td->queue, "throtl " fmt, ##args);  \
        }                                                               \
@@ -2114,14 +2112,9 @@ static inline void throtl_update_latency_buckets(struct throtl_data *td)
 static void blk_throtl_assoc_bio(struct throtl_grp *tg, struct bio *bio)
 {
 #ifdef CONFIG_BLK_DEV_THROTTLING_LOW
-       int ret;
-
-       ret = bio_associate_current(bio);
-       if (ret == 0 || ret == -EBUSY)
+       if (bio->bi_css)
                bio->bi_cg_private = tg;
        blk_stat_set_issue(&bio->bi_issue_stat, bio_sectors(bio));
-#else
-       bio_associate_current(bio);
 #endif
 }