Merge remote-tracking branch 'parisc-hd/for-next'

[karo-tx-linux.git] / include / linux / nfs3.h

diff --git a/include/linux/nfs3.h b/include/linux/nfs3.h
index 6ccfe3b641e18f0522114758c8634a5fe84c4c0d..a778ad8e3afd8080c4427d9aae4e08495caa5e80 100644 (file)
--- a/include/linux/nfs3.h
+++ b/include/linux/nfs3.h
@@ -4,100 +4,10 @@
 #ifndef _LINUX_NFS3_H
 #define _LINUX_NFS3_H
 
-#define NFS3_PORT              2049
-#define NFS3_MAXDATA           32768
-#define NFS3_MAXPATHLEN                PATH_MAX
-#define NFS3_MAXNAMLEN         NAME_MAX
-#define NFS3_MAXGROUPS         16
-#define NFS3_FHSIZE            64
-#define NFS3_COOKIESIZE                4
-#define NFS3_CREATEVERFSIZE    8
-#define NFS3_COOKIEVERFSIZE    8
-#define NFS3_WRITEVERFSIZE     8
-#define NFS3_FIFO_DEV          (-1)
-#define NFS3MODE_FMT           0170000
-#define NFS3MODE_DIR           0040000
-#define NFS3MODE_CHR           0020000
-#define NFS3MODE_BLK           0060000
-#define NFS3MODE_REG           0100000
-#define NFS3MODE_LNK           0120000
-#define NFS3MODE_SOCK          0140000
-#define NFS3MODE_FIFO          0010000
+#include <uapi/linux/nfs3.h>
 
-/* Flags for access() call */
-#define NFS3_ACCESS_READ       0x0001
-#define NFS3_ACCESS_LOOKUP     0x0002
-#define NFS3_ACCESS_MODIFY     0x0004
-#define NFS3_ACCESS_EXTEND     0x0008
-#define NFS3_ACCESS_DELETE     0x0010
-#define NFS3_ACCESS_EXECUTE    0x0020
-#define NFS3_ACCESS_FULL       0x003f
-
-/* Flags for create mode */
-enum nfs3_createmode {
-       NFS3_CREATE_UNCHECKED = 0,
-       NFS3_CREATE_GUARDED = 1,
-       NFS3_CREATE_EXCLUSIVE = 2
-};
-
-/* NFSv3 file system properties */
-#define NFS3_FSF_LINK          0x0001
-#define NFS3_FSF_SYMLINK       0x0002
-#define NFS3_FSF_HOMOGENEOUS   0x0008
-#define NFS3_FSF_CANSETTIME    0x0010
-/* Some shorthands. See fs/nfsd/nfs3proc.c */
-#define NFS3_FSF_DEFAULT       0x001B
-#define NFS3_FSF_BILLYBOY      0x0018
-#define NFS3_FSF_READONLY      0x0008
-
-enum nfs3_ftype {
-       NF3NON  = 0,
-       NF3REG  = 1,
-       NF3DIR  = 2,
-       NF3BLK  = 3,
-       NF3CHR  = 4,
-       NF3LNK  = 5,
-       NF3SOCK = 6,
-       NF3FIFO = 7,    /* changed from NFSv2 (was 8) */
-       NF3BAD  = 8
-};
-
-struct nfs3_fh {
-       unsigned short size;
-       unsigned char  data[NFS3_FHSIZE];
-};
-
-#define NFS3_VERSION           3
-#define NFS3PROC_NULL          0
-#define NFS3PROC_GETATTR       1
-#define NFS3PROC_SETATTR       2
-#define NFS3PROC_LOOKUP                3
-#define NFS3PROC_ACCESS                4
-#define NFS3PROC_READLINK      5
-#define NFS3PROC_READ          6
-#define NFS3PROC_WRITE         7
-#define NFS3PROC_CREATE                8
-#define NFS3PROC_MKDIR         9
-#define NFS3PROC_SYMLINK       10
-#define NFS3PROC_MKNOD         11
-#define NFS3PROC_REMOVE                12
-#define NFS3PROC_RMDIR         13
-#define NFS3PROC_RENAME                14
-#define NFS3PROC_LINK          15
-#define NFS3PROC_READDIR       16
-#define NFS3PROC_READDIRPLUS   17
-#define NFS3PROC_FSSTAT                18
-#define NFS3PROC_FSINFO                19
-#define NFS3PROC_PATHCONF      20
-#define NFS3PROC_COMMIT                21
-
-#define NFS_MNT3_VERSION       3
- 
-
-#if defined(__KERNEL__)
 
 /* Number of 32bit words in post_op_attr */
 #define NFS3_POST_OP_ATTR_WORDS                22
 
-#endif /* __KERNEL__ */
 #endif /* _LINUX_NFS3_H */