aboutsummaryrefslogtreecommitdiff
path: root/block/blktrace.c
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-03-03 09:18:47 -0600
committerFelix Blyakher <felixb@sgi.com>2009-03-03 09:18:47 -0600
commitd4fc7cea5dda04ae1a6f36175ec1dd8ff088ed52 (patch)
tree3d65887b06c575a94feed1fd91216e32a62b31d8 /block/blktrace.c
parent3a011a171906a3a51a43bb860fb7c66a64cab140 (diff)
parent2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'block/blktrace.c')
-rw-r--r--block/blktrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blktrace.c b/block/blktrace.c
index 39cc3bfe56e..7cf9d1ff45a 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -142,7 +142,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
what |= ddir_act[rw & WRITE];
what |= MASK_TC_BIT(rw, BARRIER);
- what |= MASK_TC_BIT(rw, SYNC);
+ what |= MASK_TC_BIT(rw, SYNCIO);
what |= MASK_TC_BIT(rw, AHEAD);
what |= MASK_TC_BIT(rw, META);
what |= MASK_TC_BIT(rw, DISCARD);