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 branch 'for-2.6.32' of git://linux-nfs.org/~bfields/linux
[safe/jmp/linux-2.6]
/
include
/
linux
/
nfs4.h
diff --git
a/include/linux/nfs4.h
b/include/linux/nfs4.h
index
aff924a
..
c4c0602
100644
(file)
--- a/
include/linux/nfs4.h
+++ b/
include/linux/nfs4.h
@@
-472,6
+472,7
@@
enum lock_type4 {
#define NFSPROC4_NULL 0
#define NFSPROC4_COMPOUND 1
+#define NFS4_VERSION 4
#define NFS4_MINOR_VERSION 0
#if defined(CONFIG_NFS_V4_1)