diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-02-28 09:50:39 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-28 09:50:39 +0300 |
| commit | 0614621d89c43ea5b28456c2baf6b0c0e00ca81e (patch) | |
| tree | 2dff833e972bdb65d30cb317985a0d41d2c40f0e /include/linux/blktrace_api.h | |
| parent | 0cf264b3133dce56a60ca8b4335d1f76fe26870a (diff) | |
| parent | 7d762d69145a54d169f58e56d6dac57a5508debc (diff) | |
| download | linux-0614621d89c43ea5b28456c2baf6b0c0e00ca81e.tar.xz | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/blktrace_api.h')
| -rw-r--r-- | include/linux/blktrace_api.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 8804753805ac..7bb2d8de9f30 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -116,7 +116,13 @@ extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes); static inline sector_t blk_rq_trace_sector(struct request *rq) { - return blk_rq_is_passthrough(rq) ? 0 : blk_rq_pos(rq); + /* + * Tracing should ignore starting sector for passthrough requests and + * requests where starting sector didn't get set. + */ + if (blk_rq_is_passthrough(rq) || blk_rq_pos(rq) == (sector_t)-1) + return 0; + return blk_rq_pos(rq); } static inline unsigned int blk_rq_trace_nr_sectors(struct request *rq) |