diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-06 08:31:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-06 08:31:47 -0700 |
commit | 6367f1775ebb66b0f0e9e3512159f3257a6fde0e (patch) | |
tree | 113dadfab2a16ab63047a8b350f9facdb5060a82 /include/linux | |
parent | a7c56ebac1bce799b583230595b4de9ccb8162d0 (diff) | |
parent | 983c7db347db8ce2d8453fd1d89b7a4bb6920d56 (diff) |
Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm
* 'for-linus' of http://people.redhat.com/agk/git/linux-dm:
dm crypt: always disable discard_zeroes_data
dm: raid fix write_mostly arg validation
dm table: avoid crash if integrity profile changes
dm: flakey fix corrupt_bio_byte error path
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/device-mapper.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 3fa1f3d90ce..99e3e50b5c5 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -197,6 +197,11 @@ struct dm_target { * whether or not its underlying devices have support. */ unsigned discards_supported:1; + + /* + * Set if this target does not return zeroes on discarded blocks. + */ + unsigned discard_zeroes_data_unsupported:1; }; /* Each target can link one of these into the table */ |