[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-nfsv4
Subject:    [PATCH 1/5] nfs-utils - Dynamic Pseudo Root - Release 6
From:       Steve Dickson <SteveD () redhat ! com>
Date:       2009-09-23 20:01:53
Message-ID: 4ABA7EB1.4060207 () RedHat ! com
[Download RAW message or body]

commit 95b41f4f3ac458e15b671afb0fd73c198af345ff
Author: Steve Dickson <steved@redhat.com>
Date:   Thu May 14 10:40:23 2009 -0400

    The header file changes needed to support dynamic pseudo roots.
    
    Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/include/exportfs.h b/support/include/exportfs.h
index a5cf482..1ad41e2 100644
--- a/support/include/exportfs.h
+++ b/support/include/exportfs.h
@@ -12,6 +12,17 @@
 #include <netdb.h>
 #include "nfslib.h"
 
+enum nfsd_fsid {
+	FSID_DEV = 0,
+	FSID_NUM,
+	FSID_MAJOR_MINOR,
+	FSID_ENCODE_DEV,
+	FSID_UUID4_INUM,
+	FSID_UUID8,
+	FSID_UUID16,
+	FSID_UUID16_INUM,
+};
+
 enum {
 	MCL_FQDN = 0,
 	MCL_SUBNETWORK,
diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index f7a99ba..76953ac 100644
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -24,6 +24,7 @@
 #define NFSEXP_FSID		0x2000
 #define	NFSEXP_CROSSMOUNT	0x4000
 #define NFSEXP_NOACL		0x8000 /* reserved for possible ACL related use */
-#define NFSEXP_ALLFLAGS		0xFFFF
+#define NFSEXP_V4ROOT       0x10000
+#define NFSEXP_ALLFLAGS		0x1FFFF
 
 #endif /* _NSF_EXPORT_H */
diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 537a31e..e4777dd 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -88,6 +88,7 @@ struct exportent {
 	int             e_fslocmethod;
 	char *          e_fslocdata;
 	char *		e_uuid;
+	void *		e_v4root;
 	struct sec_entry e_secinfo[SECFLAVOR_COUNT+1];
 };
 
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index e4e2f22..ac5477b 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -37,18 +37,6 @@
 #include "blkid/blkid.h"
 #endif
 
-
-enum nfsd_fsid {
-	FSID_DEV = 0,
-	FSID_NUM,
-	FSID_MAJOR_MINOR,
-	FSID_ENCODE_DEV,
-	FSID_UUID4_INUM,
-	FSID_UUID8,
-	FSID_UUID16,
-	FSID_UUID16_INUM,
-};
-
 /*
  * Support routines for text-based upcalls.
  * Fields are separated by spaces.

_______________________________________________
NFSv4 mailing list
NFSv4@linux-nfs.org
http://linux-nfs.org/cgi-bin/mailman/listinfo/nfsv4
[prev in list] [next in list] [prev in thread] [next in thread]