diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /kernel/trace | |
| parent | 0b498a52778368ff501557d68c7b50878ab1701e (diff) | |
| parent | e4e98c460ad38c78498622a164fd5ef09a2dc9cb (diff) | |
| download | op-kernel-dev-6abdd5f5935fff978f950561f3c5175eb34dad73.zip op-kernel-dev-6abdd5f5935fff978f950561f3c5175eb34dad73.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/blktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 7598e6c..dbafc5d 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -223,7 +223,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes, what |= MASK_TC_BIT(op_flags, META); what |= MASK_TC_BIT(op_flags, PREFLUSH); what |= MASK_TC_BIT(op_flags, FUA); - if (op == REQ_OP_DISCARD) + if (op == REQ_OP_DISCARD || op == REQ_OP_SECURE_ERASE) what |= BLK_TC_ACT(BLK_TC_DISCARD); if (op == REQ_OP_FLUSH) what |= BLK_TC_ACT(BLK_TC_FLUSH); |
