diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 11:01:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 11:01:21 -0400 |
| commit | df5529297ec4c32d57dd149398e3add6c37bc054 (patch) | |
| tree | 24e40e2286f2d6396994ed92906420890b4cf9c3 /include | |
| parent | 97c18e2c7a8e36d2d83d50ee070314aadac73a11 (diff) | |
| parent | 340cd44451fb0bfa542365e6b4b565bbd44836e2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
dm kcopyd: fix callback race
dm kcopyd: prepare for callback race fix
dm: implement basic barrier support
dm: remove dm_request loop
dm: rework queueing and suspension
dm: simplify dm_request loop
dm: split DMF_BLOCK_IO flag into two
dm: rearrange dm_wq_work
dm: remove limited barrier support
dm: add integrity support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device-mapper.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 66ec05a57955..ded2d7c42668 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h | |||
| @@ -116,7 +116,6 @@ void dm_put_device(struct dm_target *ti, struct dm_dev *d); | |||
| 116 | /* | 116 | /* |
| 117 | * Target features | 117 | * Target features |
| 118 | */ | 118 | */ |
| 119 | #define DM_TARGET_SUPPORTS_BARRIERS 0x00000001 | ||
| 120 | 119 | ||
| 121 | struct target_type { | 120 | struct target_type { |
| 122 | uint64_t features; | 121 | uint64_t features; |