Commit 288dab8a35a0 ("block: add a separate operation type for secure erase") split REQ_OP_SECURE_ERASE from REQ_OP_DISCARD without considering all the places REQ_OP_DISCARD was being used to mean either. Fix those.
Showing the changes to kernel (1 of 9 files). Show all
Unified · Split
| @@ -223,7 +223,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes, · 222 unmodified lines | ||
| 223 | 223 | what |= MASK_TC_BIT(op_flags, META); |
| 224 | 224 | what |= MASK_TC_BIT(op_flags, PREFLUSH); |
| 225 | 225 | what |= MASK_TC_BIT(op_flags, FUA); |
| 226 | − if (op == REQ_OP_DISCARD) | |
| 226 | + if (op == REQ_OP_DISCARD || op == REQ_OP_SECURE_ERASE) | |
| 227 | 227 | what |= BLK_TC_ACT(BLK_TC_DISCARD); |
| 228 | 228 | if (op == REQ_OP_FLUSH) |
| 229 | 229 | what |= BLK_TC_ACT(BLK_TC_FLUSH); |