diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-22 13:11:20 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-22 13:11:20 +1000 |
commit | 8295fba1263fd0e3a0b88de1e6db037cf3577ef3 (patch) | |
tree | 89247228eef316f1a95ec6b84d3894e9d38d07e3 /include | |
parent | 5b5fe545365eb9d44863da0d5898bef8034e5e1b (diff) | |
parent | 512dfa26d2d4228e32e3e2ca3aaadab02dec15c2 (diff) |
Merge commit 'dlm/next'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/dlm.h | 5 | ||||
-rw-r--r-- | include/linux/dlm_device.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h index 203a025e30e5..b9cd38603fd8 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h @@ -2,7 +2,7 @@ ******************************************************************************* ** ** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -** Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. +** Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. ** ** This copyrighted material is made available to anyone wishing to use, ** modify, copy, or redistribute it subject to the terms and conditions @@ -65,9 +65,12 @@ struct dlm_lksb { char * sb_lvbptr; }; +/* dlm_new_lockspace() flags */ + #define DLM_LSFL_NODIR 0x00000001 #define DLM_LSFL_TIMEWARN 0x00000002 #define DLM_LSFL_FS 0x00000004 +#define DLM_LSFL_NEWEXCL 0x00000008 #ifdef __KERNEL__ diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h index c6034508fed9..3060783c4191 100644 --- a/include/linux/dlm_device.h +++ b/include/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 0 +#define DLM_DEVICE_VERSION_PATCH 1 /* struct passed to the lock write */ struct dlm_lock_params { |