Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / include / linux / nfs.h

diff --git a/include/linux/nfs.h b/include/linux/nfs.h
index 54af92c..8c6ee44 100644 (file)
--- a/include/linux/nfs.h
+++ b/include/linux/nfs.h
@@ -25,8 +25,11 @@
 #define NFSMODE_SOCK   0140000
 #define NFSMODE_FIFO   0010000
 
-#define NFS_MNT_PROGRAM        100005
-#define NFS_MNT_PORT   627
+#define NFS_MNT_PROGRAM                100005
+#define NFS_MNT_VERSION                1
+#define NFS_MNT3_VERSION       3
+
+#define NFS_PIPE_DIRNAME "/nfs"
 
 /*
  * NFS stats. The good thing with these values is that NFSv3 errors are
@@ -109,7 +112,6 @@
        NFSERR_FILE_OPEN = 10046,      /*       v4 */
        NFSERR_ADMIN_REVOKED = 10047,  /*       v4 */
        NFSERR_CB_PATH_DOWN = 10048,   /*       v4 */
-       NFSERR_REPLAY_ME = 10049        /*       v4 */
 };
 
 /* NFSv2 file types - beware, these are not the same in NFSv3 */