xnu-792.6.56.tar.gz

[apple/xnu.git] / bsd / nfs / nfsproto.h

diff --git a/bsd/nfs/nfsproto.h b/bsd/nfs/nfsproto.h
index 8b077777df7a1d6bc28769093b7bd7f6a3e0cfb4..33b9c47a2ab7219b8b7ec1d9b0cadc5a88802a20 100644 (file)
--- a/bsd/nfs/nfsproto.h
+++ b/bsd/nfs/nfsproto.h
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -88,12 +86,14 @@
 #define        NFS_VER3        3
 #define NFS_V2MAXDATA  8192
 #define        NFS_MAXDGRAMDATA 16384
-#define        NFS_MAXDATA     32768
+#define        NFS_PREFDGRAMDATA 8192
+#define        NFS_MAXDATA     (60*1024) // XXX not ready for 64K-128K
 #define        NFS_MAXPATHLEN  1024
 #define        NFS_MAXNAMLEN   255
 #define        NFS_MAXPKTHDR   404
 #define NFS_MAXPACKET  (NFS_MAXPKTHDR + NFS_MAXDATA)
 #define        NFS_MINPACKET   20
+#define        NFS_MAXSOCKBUF  (224*1024)
 #define        NFS_FABLKSIZE   512     /* Size in bytes of a block wrt fa_blocks */
 
 /* Stat numbers for rpc returns (version 2 and 3) */
@@ -147,11 +147,9 @@
 #define NFSX_V2STATFS  20
 
 /* specific to NFS Version 3 */
-#define NFSX_V3FH              (sizeof (fhandle_t)) /* size this server uses */
 #define        NFSX_V3FHMAX            64      /* max. allowed by protocol */
 #define NFSX_V3FATTR           84
 #define NFSX_V3SATTR           60      /* max. all fields filled in */
-#define NFSX_V3SRVSATTR                (sizeof (struct nfsv3_sattr))
 #define NFSX_V3POSTOPATTR      (NFSX_V3FATTR + NFSX_UNSIGNED)
 #define NFSX_V3WCCDATA         (NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)
 #define NFSX_V3COOKIEVERF      8
@@ -164,7 +162,7 @@
 /* variants for both versions */
 #define NFSX_FH(v3)            ((v3) ? (NFSX_V3FHMAX + NFSX_UNSIGNED) : \
                                        NFSX_V2FH)
-#define NFSX_SRVFH(v3)         ((v3) ? NFSX_V3FH : NFSX_V2FH)
+#define NFSX_SRVFH(v3,FH)      ((v3) ? (FH)->nfh_len : NFSX_V2FH)
 #define        NFSX_FATTR(v3)          ((v3) ? NFSX_V3FATTR : NFSX_V2FATTR)
 #define NFSX_PREOPATTR(v3)     ((v3) ? (7 * NFSX_UNSIGNED) : 0)
 #define NFSX_POSTOPATTR(v3)    ((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : 0)
@@ -208,13 +206,8 @@
 
 #endif /* !NFS_PROGRAM */
 
-/* And leasing (nqnfs) procedure numbers (must be last) */
-#define        NQNFSPROC_GETLEASE      22
-#define        NQNFSPROC_VACATED       23
-#define        NQNFSPROC_EVICTED       24
-
-#define NFSPROC_NOOP           25
-#define        NFS_NPROCS              26
+#define NFSPROC_NOOP           22
+#define        NFS_NPROCS              23
 
 /* Actual Version 2 procedure numbers */
 #define        NFSV2PROC_NULL          0
@@ -266,8 +259,8 @@
 
 /* Conversion macros */
 #define        vtonfsv2_mode(t,m) \
-               txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
-                               MAKEIMODE((t), (m)))
+               txdr_unsigned(((t) == VFIFO) ? vnode_makeimode(VCHR, (m)) : \
+                               vnode_makeimode((t), (m)))
 #define vtonfsv3_mode(m)       txdr_unsigned((m) & 07777)
 #define        nfstov_mode(a)          (fxdr_unsigned(u_short, (a))&07777)
 #define        vtonfsv2_type(a)        txdr_unsigned(nfsv2_type[((long)(a))])
@@ -294,11 +287,6 @@ typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
 #ifndef NFS_SMALLFH
 #define NFS_SMALLFH    64
 #endif
-union nfsfh {
-       fhandle_t       fh_generic;
-       u_char          fh_bytes[NFS_SMALLFH];
-};
-typedef union nfsfh nfsfh_t;
 
 struct nfsv2_time {
        u_long  nfsv2_sec;
@@ -407,21 +395,6 @@ struct nfsv2_sattr {
        nfstime2        sa_mtime;
 };
 
-/*
- * NFS Version 3 sattr structure for the new node creation case.
- */
-struct nfsv3_sattr {
-       u_long          sa_modetrue;
-       u_long          sa_mode;
-       u_long          sa_uidtrue;
-       u_long          sa_uid;
-       u_long          sa_gidtrue;
-       u_long          sa_gid;
-       u_long          sa_sizefalse;
-       u_long          sa_atimetype;
-       u_long          sa_mtimetype;
-};
-
 struct nfs_statfs {
        union {
                struct {