xnu-792.22.5.tar.gz

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

diff --git a/bsd/nfs/nfs.h b/bsd/nfs/nfs.h
index b23acc3aa16e003b96209bcab7f89804836ff1ac..79e58917ff03a0efbc52413d4211b3fbc0c171ad 100644 (file)
--- a/bsd/nfs/nfs.h
+++ b/bsd/nfs/nfs.h
@@ -100,6 +100,7 @@
 #ifndef NFS_MAXDIRATTRTIMO
 #define        NFS_MAXDIRATTRTIMO 60
 #endif
 #ifndef NFS_MAXDIRATTRTIMO
 #define        NFS_MAXDIRATTRTIMO 60
 #endif

+#define        NFS_IOSIZE      (256 * 1024)    /* suggested I/O size */

 #define        NFS_WSIZE       16384           /* Def. write data size <= 16K */
 #define        NFS_RSIZE       16384           /* Def. read data size <= 16K */
 #define        NFS_DGRAM_WSIZE 8192            /* UDP Def. write data size <= 8K */
 #define        NFS_WSIZE       16384           /* Def. write data size <= 16K */
 #define        NFS_RSIZE       16384           /* Def. read data size <= 16K */
 #define        NFS_DGRAM_WSIZE 8192            /* UDP Def. write data size <= 8K */


@@ -221,17 +222,13 @@ struct nfs_args3 {
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with nfs_args
  */
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with nfs_args
  */

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-

 struct user_nfs_args {
        int             version;        /* args structure version number */
 struct user_nfs_args {
        int             version;        /* args structure version number */

-       user_addr_t     addr;           /* file server address */
+       user_addr_t     addr __attribute((aligned(8)));         /* file server address */

        int             addrlen;        /* length of address */
        int             sotype;         /* Socket type */
        int             proto;          /* and Protocol */
        int             addrlen;        /* length of address */
        int             sotype;         /* Socket type */
        int             proto;          /* and Protocol */

-       user_addr_t     fh;             /* File handle to be mounted */
+       user_addr_t     fh __attribute((aligned(8)));           /* File handle to be mounted */

        int             fhsize;         /* Size, in bytes, of fh */
        int             flags;          /* flags */
        int             wsize;          /* write size in bytes */
        int             fhsize;         /* Size, in bytes, of fh */
        int             flags;          /* flags */
        int             wsize;          /* write size in bytes */


@@ -243,7 +240,7 @@ struct user_nfs_args {
        int             readahead;      /* # of blocks to readahead */
        int             leaseterm;      /* obsolete: Term (sec) of lease */
        int             deadthresh;     /* obsolete: Retrans threshold */
        int             readahead;      /* # of blocks to readahead */
        int             leaseterm;      /* obsolete: Term (sec) of lease */
        int             deadthresh;     /* obsolete: Retrans threshold */

-       user_addr_t     hostname;       /* server's name */
+       user_addr_t     hostname __attribute((aligned(8)));     /* server's name */

        /* NFS_ARGSVERSION 3 ends here */
        int             acregmin;       /* reg file min attr cache timeout */
        int             acregmax;       /* reg file max attr cache timeout */
        /* NFS_ARGSVERSION 3 ends here */
        int             acregmin;       /* reg file min attr cache timeout */
        int             acregmax;       /* reg file max attr cache timeout */


@@ -252,11 +249,11 @@ struct user_nfs_args {
 };
 struct user_nfs_args3 {
        int             version;        /* args structure version number */
 };
 struct user_nfs_args3 {
        int             version;        /* args structure version number */

-       user_addr_t     addr;           /* file server address */
+       user_addr_t     addr __attribute((aligned(8)));         /* file server address */

        int             addrlen;        /* length of address */
        int             sotype;         /* Socket type */
        int             proto;          /* and Protocol */
        int             addrlen;        /* length of address */
        int             sotype;         /* Socket type */
        int             proto;          /* and Protocol */

-       user_addr_t     fh;             /* File handle to be mounted */
+       user_addr_t     fh __attribute((aligned(8)));           /* File handle to be mounted */

        int             fhsize;         /* Size, in bytes, of fh */
        int             flags;          /* flags */
        int             wsize;          /* write size in bytes */
        int             fhsize;         /* Size, in bytes, of fh */
        int             flags;          /* flags */
        int             wsize;          /* write size in bytes */


@@ -268,13 +265,9 @@ struct user_nfs_args3 {
        int             readahead;      /* # of blocks to readahead */
        int             leaseterm;      /* obsolete: Term (sec) of lease */
        int             deadthresh;     /* obsolete: Retrans threshold */
        int             readahead;      /* # of blocks to readahead */
        int             leaseterm;      /* obsolete: Term (sec) of lease */
        int             deadthresh;     /* obsolete: Retrans threshold */

-       user_addr_t     hostname;       /* server's name */
+       user_addr_t     hostname __attribute((aligned(8)));     /* server's name */

 };
 
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #endif // KERNEL
 
 /*
 #endif // KERNEL
 
 /*


@@ -346,20 +339,12 @@ struct nfsd_args {
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with nfsd_args
  */
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with nfsd_args
  */

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-

 struct user_nfsd_args {
        int             sock;           /* Socket to serve */
 struct user_nfsd_args {
        int             sock;           /* Socket to serve */

-       user_addr_t     name;           /* Client addr for connection based sockets */
+       user_addr_t     name __attribute((aligned(8)));         /* Client addr for connection based sockets */

        int             namelen;        /* Length of name */
 };
 
        int             namelen;        /* Length of name */
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #endif // KERNEL
 
 struct nfsd_srvargs {
 #endif // KERNEL
 
 struct nfsd_srvargs {


@@ -439,10 +424,6 @@ struct nfs_export_args {
 #ifdef KERNEL
 /* LP64 version of export_args */
 
 #ifdef KERNEL
 /* LP64 version of export_args */
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-

 struct user_nfs_export_args {
        uint32_t                nxa_fsid;       /* export FS ID */
        uint32_t                nxa_expid;      /* export ID */
 struct user_nfs_export_args {
        uint32_t                nxa_fsid;       /* export FS ID */
        uint32_t                nxa_expid;      /* export ID */


@@ -453,10 +434,6 @@ struct user_nfs_export_args {
        user_addr_t             nxa_nets;       /* array of net args */
 };
 
        user_addr_t             nxa_nets;       /* array of net args */
 };
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #endif /* KERNEL */
 
 /* nfs export arg flags */
 #endif /* KERNEL */
 
 /* nfs export arg flags */