Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | trace-cmd: Add blktrace_api compatibility for TC_BARRIER |
| 2 | |
| 3 | Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd |
| 4 | can build regardless of the linux-kernel-headers version. |
| 5 | |
| 6 | Upstream-Status: Inappropriate [Stop gap] |
| 7 | |
| 8 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| 9 | |
| 10 | diff --git a/plugin_blk.c b/plugin_blk.c |
| 11 | index 9327b17..c8e5e1c 100644 |
| 12 | --- a/plugin_blk.c |
| 13 | +++ b/plugin_blk.c |
| 14 | @@ -44,6 +44,15 @@ struct blk_data { |
| 15 | unsigned short pdu_len; |
| 16 | }; |
| 17 | |
| 18 | +/* |
| 19 | + * Newer kernels don't define BLK_TC_BARRIER and have replaced it with |
| 20 | + * BLK_TC_FLUSH. In this case, define it here and report FLUSHES as BARRIERS as |
| 21 | + * a workaround, as described in: |
| 22 | + * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=c09c47caedc9854d59378d6e34c989e51cfdd2b4 |
| 23 | + */ |
| 24 | +#ifndef BLK_TC_BARRIER |
| 25 | +#define BLK_TC_BARRIER 1<<2 |
| 26 | +#endif |
| 27 | static void fill_rwbs(char *rwbs, int action, unsigned int bytes) |
| 28 | { |
| 29 | int i = 0; |