diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-09-21 09:58:02 +0200 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-09-21 09:58:02 +0200 | 
| commit | 74656d03ac36fabb16b9df5221cf398ee3a9ca08 (patch) | |
| tree | 0600e619ac817e2c016c148810814f55280316cc /include/linux/dm-io.h | |
| parent | 0d97db026509c1a13f732b22670ab1f0ac9d8d87 (diff) | |
| parent | 521a547ced6477c54b4b0cc206000406c221b4d6 (diff) | |
Merge tag 'v6.0-rc6' into locking/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/dm-io.h')
| -rw-r--r-- | include/linux/dm-io.h | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dm-io.h b/include/linux/dm-io.h index a52c6580cc9a..8e1c4ab5df04 100644 --- a/include/linux/dm-io.h +++ b/include/linux/dm-io.h @@ -13,6 +13,7 @@  #ifdef __KERNEL__  #include <linux/types.h> +#include <linux/blk_types.h>  struct dm_io_region {  	struct block_device *bdev; @@ -57,8 +58,7 @@ struct dm_io_notify {   */  struct dm_io_client;  struct dm_io_request { -	int bi_op;			/* REQ_OP */ -	int bi_op_flags;		/* req_flag_bits */ +	blk_opf_t	    bi_opf;	/* Request type and flags */  	struct dm_io_memory mem;	/* Memory to use for io */  	struct dm_io_notify notify;	/* Synchronous if notify.fn is NULL */  	struct dm_io_client *client;	/* Client memory handler */  | 
