diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/aio.h | 8 | ||||
| -rw-r--r-- | include/linux/blk_types.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index 985e664fb05d..9c3cfc551c64 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h @@ -8,6 +8,7 @@ #include <linux/rcupdate.h> #include <linux/atomic.h> #include <linux/batch_complete.h> +#include <linux/blk_types.h> struct kioctx; struct kiocb; @@ -105,6 +106,13 @@ static inline bool kiocb_cancelled(struct kiocb *kiocb) return kiocb->ki_cancel == KIOCB_CANCELLED; } +#ifdef CONFIG_BLOCK +static inline bool bio_cancelled(struct bio *bio) +{ + return bio->bi_iocb && kiocb_cancelled(bio->bi_iocb); +} +#endif + static inline bool is_sync_kiocb(struct kiocb *kiocb) { return kiocb->ki_ctx == NULL; diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 9d3cafa6bbcd..7252484807bf 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -43,6 +43,7 @@ struct bio { * top bits priority */ + struct kiocb *bi_iocb; short bi_error; unsigned short bi_vcnt; /* how many bio_vec's */ unsigned short bi_idx; /* current index into bvl_vec */ |