diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-03 10:34:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-03 10:34:03 -0700 |
| commit | 7b66f13207e60e7c550af730986e77e38a0c69a3 (patch) | |
| tree | c2dad63d3ef3513a6656b39fb3ed0f974a6fff97 /include | |
| parent | d35a878ae1c50977b55e352fd46e36e35add72a0 (diff) | |
| parent | 412445acb6cad4cef026daae37c4765fb9942c60 (diff) | |
Merge tag 'for-4.12/dm-post-merge-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull additional device mapper updates from Mike Snitzer:
"Here are some changes from Christoph that needed to be rebased ontop
of changes that were already merged into the device mapper tree. In
addition, these changes depend on the 'for-4.12/block' changes that
you've already merged.
- Cleanups to request-based DM and DM multipath from Christoph that
prepare for his block core error code type checking improvements"
* tag 'for-4.12/dm-post-merge-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm: introduce a new DM_MAPIO_KILL return value
dm rq: change ->rq_end_io calling conventions
dm mpath: merge do_end_io into multipath_end_io
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device-mapper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 925b63cdef52..78ad0624cdae 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -593,6 +593,7 @@ extern struct ratelimit_state dm_ratelimit_state; /* * Definitions of return values from target end_io function. */ +#define DM_ENDIO_DONE 0 #define DM_ENDIO_INCOMPLETE 1 #define DM_ENDIO_REQUEUE 2 @@ -603,6 +604,7 @@ extern struct ratelimit_state dm_ratelimit_state; #define DM_MAPIO_REMAPPED 1 #define DM_MAPIO_REQUEUE DM_ENDIO_REQUEUE #define DM_MAPIO_DELAY_REQUEUE 3 +#define DM_MAPIO_KILL 4 #define dm_sector_div64(x, y)( \ { \ |