summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2008-08-10 11:21:57 +0100
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 08:56:01 +0200
commit27b29e86bf3d4b3cf6641a0efd78ed11a9b633b2 (patch)
tree0cfa20e8f07ee9d57e43a5371b4d97eeb8202081 /block
parentfdc53971bce56d299cb5f1f06ecbff30b34cbaf2 (diff)
downloadop-kernel-dev-27b29e86bf3d4b3cf6641a0efd78ed11a9b633b2.zip
op-kernel-dev-27b29e86bf3d4b3cf6641a0efd78ed11a9b633b2.tar.gz
blktrace: support discard requests
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/blktrace.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/block/blktrace.c b/block/blktrace.c
index eb9651c..7495a84 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -114,7 +114,13 @@ static u32 ddir_act[2] __read_mostly = { BLK_TC_ACT(BLK_TC_READ), BLK_TC_ACT(BLK
/*
* Bio action bits of interest
*/
-static u32 bio_act[9] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_ACT(BLK_TC_SYNC), 0, BLK_TC_ACT(BLK_TC_AHEAD), 0, 0, 0, BLK_TC_ACT(BLK_TC_META) };
+static u32 bio_act[17] __read_mostly = {
+ [1] = BLK_TC_ACT(BLK_TC_BARRIER),
+ [2] = BLK_TC_ACT(BLK_TC_SYNC),
+ [4] = BLK_TC_ACT(BLK_TC_AHEAD),
+ [8] = BLK_TC_ACT(BLK_TC_META),
+ [16] = BLK_TC_ACT(BLK_TC_DISCARD)
+};
/*
* More could be added as needed, taking care to increment the decrementer
@@ -128,6 +134,8 @@ static u32 bio_act[9] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_AC
(((rw) & (1 << BIO_RW_AHEAD)) << (2 - BIO_RW_AHEAD))
#define trace_meta_bit(rw) \
(((rw) & (1 << BIO_RW_META)) >> (BIO_RW_META - 3))
+#define trace_discard_bit(rw) \
+ (((rw) & (1 << BIO_RW_DISCARD)) >> (BIO_RW_DISCARD - 4))
/*
* The worker for the various blk_add_trace*() types. Fills out a
@@ -151,6 +159,7 @@ void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
what |= bio_act[trace_sync_bit(rw)];
what |= bio_act[trace_ahead_bit(rw)];
what |= bio_act[trace_meta_bit(rw)];
+ what |= bio_act[trace_discard_bit(rw)];
pid = tsk->pid;
if (unlikely(act_log_check(bt, what, sector, pid)))
OpenPOWER on IntegriCloud