From 637c6000c0686af43b8269537653fd216e61966a Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Mon, 1 Aug 2011 10:31:06 +0200 Subject: [PATCH] --- yaml --- r: 263133 b: refs/heads/master c: e5a94f56845bb4b272d82e84b5a1e2080b07ba82 h: refs/heads/master i: 263131: 0cf3d804281822563d469b7c7eb66d08dbfe4009 v: v3 --- [refs] | 2 +- trunk/block/blk-throttle.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f89562f57d35..f0ec6aefbb31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05eb0f252b04aa94ace0794f73d56c6a02351d80 +refs/heads/master: e5a94f56845bb4b272d82e84b5a1e2080b07ba82 diff --git a/trunk/block/blk-throttle.c b/trunk/block/blk-throttle.c index f6a794120505..a19f58c6fc3a 100644 --- a/trunk/block/blk-throttle.c +++ b/trunk/block/blk-throttle.c @@ -746,7 +746,7 @@ static bool tg_may_dispatch(struct throtl_data *td, struct throtl_grp *tg, static void throtl_charge_bio(struct throtl_grp *tg, struct bio *bio) { bool rw = bio_data_dir(bio); - bool sync = bio->bi_rw & REQ_SYNC; + bool sync = rw_is_sync(bio->bi_rw); /* Charge the bio to the group */ tg->bytes_disp[rw] += bio->bi_size; @@ -1150,7 +1150,7 @@ int blk_throtl_bio(struct request_queue *q, struct bio **biop) if (tg_no_rule_group(tg, rw)) { blkiocg_update_dispatch_stats(&tg->blkg, bio->bi_size, - rw, bio->bi_rw & REQ_SYNC); + rw, rw_is_sync(bio->bi_rw)); rcu_read_unlock(); return 0; }