linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / nfsd / syscall.h

diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h
index 25013b3..781efbf 100644 (file)
--- a/include/linux/nfsd/syscall.h
+++ b/include/linux/nfsd/syscall.h
@@ -40,20 +40,19 @@
 #define        NFSCTL_GETFS            8       /* get an fh by path with max FH len */
 
 /*
- * Macros used to set version and protocol
+ * Macros used to set version
  */
-#define NFSCTL_VERSET(_cltbits, _v)   ((_cltbits) |=  (1 << ((_v) - 1)))
-#define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1)))
-#define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1)))
-
-#define NFSCTL_UDPSET(_cltbits)       ((_cltbits) |=  (1 << (17 - 1)))
-#define NFSCTL_UDPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (17 - 1)))
-#define NFSCTL_UDPISSET(_cltbits)     ((_cltbits) & (1 << (17 - 1)))
-
-#define NFSCTL_TCPSET(_cltbits)       ((_cltbits) |=  (1 << (18 - 1)))
-#define NFSCTL_TCPUNSET(_cltbits)     ((_cltbits) &= ~(1 << (18 - 1)))
-#define NFSCTL_TCPISSET(_cltbits)     ((_cltbits) & (1 << (18 - 1)))
-
+#define NFSCTL_VERSET(_cltbits, _v)   ((_cltbits) |=  (1 << (_v)))
+#define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << (_v)))
+#define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << (_v)))
+
+#if defined(CONFIG_NFSD_V4)
+#define        NFSCTL_VERALL   (0x1c /* 0b011100 */)
+#elif defined(CONFIG_NFSD_V3)
+#define        NFSCTL_VERALL   (0x0c /* 0b001100 */)
+#else
+#define        NFSCTL_VERALL   (0x04 /* 0b000100 */)
+#endif
 
 /* SVC */
 struct nfsctl_svc {
@@ -136,8 +135,7 @@ extern int          exp_delclient(struct nfsctl_client *ncp);
 extern int             exp_export(struct nfsctl_export *nxp);
 extern int             exp_unexport(struct nfsctl_export *nxp);
 
-extern int nfsd_port;
-extern unsigned int nfsd_versbits, nfsd_portbits;
+extern unsigned int nfsd_versbits;
 
 #endif /* __KERNEL__ */