diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
| commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
| tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /include/linux/nfsd | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'include/linux/nfsd')
| -rw-r--r-- | include/linux/nfsd/export.h | 3 | ||||
| -rw-r--r-- | include/linux/nfsd/nfsd.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index febb7c741..0704c88e1 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h @@ -37,7 +37,8 @@ #define NFSEXP_SUNSECURE 0x0100 #define NFSEXP_CROSSMNT 0x0200 #define NFSEXP_NOSUBTREECHECK 0x0400 -#define NFSEXP_ALLFLAGS 0x07FF +#define NFSEXP_NOAUTHNLM 0x0800 /* Don't authenticate NLM requests - just trust */ +#define NFSEXP_ALLFLAGS 0x0FFF #ifdef __KERNEL__ diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 25b95ee44..67456e4d1 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h @@ -35,8 +35,9 @@ #define MAY_NOP 0 #define MAY_SATTR 8 #define MAY_TRUNC 16 -#if (MAY_SATTR | MAY_TRUNC) & (MAY_READ | MAY_WRITE | MAY_EXEC) -# error "please use a different value for MAY_SATTR or MAY_TRUNC." +#define MAY_LOCK 32 +#if (MAY_SATTR | MAY_TRUNC | MAY_LOCK) & (MAY_READ | MAY_WRITE | MAY_EXEC) +# error "please use a different value for MAY_SATTR or MAY_TRUNC or MAY_LOCK." #endif #define MAY_CREATE (MAY_EXEC|MAY_WRITE) #define MAY_REMOVE (MAY_EXEC|MAY_WRITE|MAY_TRUNC) |