summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorDavid Teigland2015-08-25 19:51:44 +0200
committerDavid Teigland2015-08-25 21:41:50 +0200
commitb96f465035f9fae83c1d8de3e80eecfe6877608c (patch)
tree75659c1ba50859bf0b5537972f94f439f2d0867e /include/uapi/linux
parentdlm: sctp_accept_from_sock() can be static (diff)
downloadkernel-qcow2-linux-b96f465035f9fae83c1d8de3e80eecfe6877608c.tar.gz
kernel-qcow2-linux-b96f465035f9fae83c1d8de3e80eecfe6877608c.tar.xz
kernel-qcow2-linux-b96f465035f9fae83c1d8de3e80eecfe6877608c.zip
dlm: fix lvb copy for user locks
For a userland lock request, the previous and current lock modes are used to decide when the lvb should be copied back to the user. The wrong previous value was used, so that it always matched the current value. This caused the lvb to be copied back to the user in the wrong cases. Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/dlm_device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/dlm_device.h b/include/uapi/linux/dlm_device.h
index 3060783c4191..df56c8ff0769 100644
--- a/include/uapi/linux/dlm_device.h
+++ b/include/uapi/linux/dlm_device.h
@@ -26,7 +26,7 @@
/* Version of the device interface */
#define DLM_DEVICE_VERSION_MAJOR 6
#define DLM_DEVICE_VERSION_MINOR 0
-#define DLM_DEVICE_VERSION_PATCH 1
+#define DLM_DEVICE_VERSION_PATCH 2
/* struct passed to the lock write */
struct dlm_lock_params {