git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[safe/jmp/linux-2.6]
/
include
/
linux
/
dlm.h
diff --git
a/include/linux/dlm.h
b/include/linux/dlm.h
index
203a025
..
0b3518c
100644
(file)
--- 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) Sistina Software, Inc. 1997-2003 All rights reserved.
-** Copyright (C) 2004-200
7
Red Hat, Inc. All rights reserved.
+** Copyright (C) 2004-200
8
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
**
** 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;
};
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_NODIR 0x00000001
#define DLM_LSFL_TIMEWARN 0x00000002
#define DLM_LSFL_FS 0x00000004
+#define DLM_LSFL_NEWEXCL 0x00000008
#ifdef __KERNEL__
#ifdef __KERNEL__
@@
-78,8
+81,8
@@
struct dlm_lksb {
* the cluster, the calling node joins it.
*/
* the cluster, the calling node joins it.
*/
-int dlm_new_lockspace(c
har *name, int namelen, dlm_lockspace_t **lockspace
,
- uint32_t flags, int lvblen);
+int dlm_new_lockspace(c
onst char *name, int namelen
,
+
dlm_lockspace_t **lockspace,
uint32_t flags, int lvblen);
/*
* dlm_release_lockspace
/*
* dlm_release_lockspace