diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:51:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:51:07 -0700 |
commit | 154f807e55977de75b1c12197c13ae14c28397b3 (patch) | |
tree | 5ff5a220e4d3080275ce4921e28ef02f374ed5f7 /drivers/md/dm-log-userspace-transfer.h | |
parent | 9b6a3df372f0318bb0ffe37ac5f4610fb9bdb44d (diff) | |
parent | ae0b7448e91353ea5f821601a055aca6b58042cd (diff) | |
download | blackbird-op-linux-154f807e55977de75b1c12197c13ae14c28397b3.tar.gz blackbird-op-linux-154f807e55977de75b1c12197c13ae14c28397b3.zip |
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 snapshot: fix on disk chunk size validation
dm exception store: split set_chunk_size
dm snapshot: fix header corruption race on invalidation
dm snapshot: refactor zero_disk_area to use chunk_io
dm log: userspace add luid to distinguish between concurrent log instances
dm raid1: do not allow log_failure variable to unset after being set
dm log: remove incorrect field from userspace table output
dm log: fix userspace status output
dm stripe: expose correct io hints
dm table: add more context to terse warning messages
dm table: fix queue_limit checking device iterator
dm snapshot: implement iterate devices
dm multipath: fix oops when request based io fails when no paths
Diffstat (limited to 'drivers/md/dm-log-userspace-transfer.h')
-rw-r--r-- | drivers/md/dm-log-userspace-transfer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-log-userspace-transfer.h b/drivers/md/dm-log-userspace-transfer.h index c26d8e4e2710..04ee874f9153 100644 --- a/drivers/md/dm-log-userspace-transfer.h +++ b/drivers/md/dm-log-userspace-transfer.h @@ -11,7 +11,7 @@ int dm_ulog_tfr_init(void); void dm_ulog_tfr_exit(void); -int dm_consult_userspace(const char *uuid, int request_type, +int dm_consult_userspace(const char *uuid, uint64_t luid, int request_type, char *data, size_t data_size, char *rdata, size_t *rdata_size); |