From e8cc4f7ddafd21b4e23256c1467bc66e4da2e623 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Wed, 9 Sep 2009 14:58:22 -0400 Subject: [PATCH] --- yaml --- r: 177202 b: refs/heads/master c: eb4c86c6a5adec423c9e615d4937fdddd06a16c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/export.c | 1 + trunk/include/linux/nfsd/export.h | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bd26724d7b88..9abbe9ae0f22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12045a6ee9908b38b6d286530c7d816e39071346 +refs/heads/master: eb4c86c6a5adec423c9e615d4937fdddd06a16c5 diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c index cb3dae2fcd86..c64d55f319bd 100644 --- a/trunk/fs/nfsd/export.c +++ b/trunk/fs/nfsd/export.c @@ -1425,6 +1425,7 @@ static struct flags { { NFSEXP_CROSSMOUNT, {"crossmnt", ""}}, { NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}}, { NFSEXP_NOAUTHNLM, {"insecure_locks", ""}}, + { NFSEXP_V4ROOT, {"v4root", ""}}, #ifdef MSNFS { NFSEXP_MSNFS, {"msnfs", ""}}, #endif diff --git a/trunk/include/linux/nfsd/export.h b/trunk/include/linux/nfsd/export.h index 4cafbe1255f0..41f0d4e25374 100644 --- a/trunk/include/linux/nfsd/export.h +++ b/trunk/include/linux/nfsd/export.h @@ -39,6 +39,16 @@ #define NFSEXP_FSID 0x2000 #define NFSEXP_CROSSMOUNT 0x4000 #define NFSEXP_NOACL 0x8000 /* reserved for possible ACL related use */ +/* + * The NFSEXP_V4ROOT flag causes the kernel to give access only to NFSv4 + * clients, and only to the single directory that is the root of the + * export; further lookup and readdir operations are treated as if every + * subdirectory was a mountpoint, and ignored if they are not themselves + * exported. This is used by nfsd and mountd to construct the NFSv4 + * pseudofilesystem, which provides access only to paths leading to each + * exported filesystem. + */ +#define NFSEXP_V4ROOT 0x10000 /* All flags that we claim to support. (Note we don't support NOACL.) */ #define NFSEXP_ALLFLAGS 0x7E3F