summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-02-23 09:56:38 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-23 09:56:38 +0000
commit3bcd3687f895f178fa8480a7bcc47a363817354a (patch)
tree13e64d5b9576b47401620aaada846f3c9c874cda /include/linux
parentd35462b4bb847b68321c55e95c926aa485aecce2 (diff)
[DLM] Remove range locks from the DLM
This patch removes support for range locking from the DLM Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dlm.h12
-rw-r--r--include/linux/dlm_device.h3
2 files changed, 2 insertions, 13 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index dd324ba44d80..1b1dcb9a40bb 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -160,15 +160,6 @@
typedef void dlm_lockspace_t;
/*
- * Lock range structure
- */
-
-struct dlm_range {
- uint64_t ra_start;
- uint64_t ra_end;
-};
-
-/*
* Lock status block
*
* Use this structure to specify the contents of the lock value block. For a
@@ -277,8 +268,7 @@ int dlm_lock(dlm_lockspace_t *lockspace,
uint32_t parent_lkid,
void (*lockast) (void *astarg),
void *astarg,
- void (*bast) (void *astarg, int mode),
- struct dlm_range *range);
+ void (*bast) (void *astarg, int mode));
/*
* dlm_unlock
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index 5e17d295544b..f8ba1981aa96 100644
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -18,7 +18,7 @@
#define DLM_USER_LVB_LEN 32
/* Version of the device interface */
-#define DLM_DEVICE_VERSION_MAJOR 3
+#define DLM_DEVICE_VERSION_MAJOR 4
#define DLM_DEVICE_VERSION_MINOR 0
#define DLM_DEVICE_VERSION_PATCH 0
@@ -28,7 +28,6 @@ struct dlm_lock_params {
__u16 flags;
__u32 lkid;
__u32 parent;
- struct dlm_range range;
__u8 namelen;
void __user *castparam;
void __user *castaddr;