xnu-4570.61.1.tar.gz

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

diff --git a/bsd/nfs/nfsm_subs.h b/bsd/nfs/nfsm_subs.h
index 434d4f57a54b5a8ab4d4a19a88754a4b0f42cf89..50f72c5fc6b99005679327f5f8ec3de7342f632f 100644 (file)
--- a/bsd/nfs/nfsm_subs.h
+++ b/bsd/nfs/nfsm_subs.h
@@ -144,6 +144,8 @@ int nfsm_chain_trim_data(struct nfsm_chain *, int, int *);
                VATTR_WANTED((VAP), va_change_time); \
                if ((VERS) == NFS_VER2) \
                        VATTR_WANTED((VAP), va_iosize); \
                VATTR_WANTED((VAP), va_change_time); \
                if ((VERS) == NFS_VER2) \
                        VATTR_WANTED((VAP), va_iosize); \

+               if ((VERS) == NFS_VER3) \
+                       VATTR_WANTED((VAP), va_filerev); \

        } while (0)
 
 /* Initialize a vnode_attr to retrieve pre-operation attributes for the NFS server. */
        } while (0)
 
 /* Initialize a vnode_attr to retrieve pre-operation attributes for the NFS server. */


@@ -433,7 +435,7 @@ int nfsm_chain_trim_data(struct nfsm_chain *, int, int *);
 
 /* add NFSv4 COMPOUND header */
 #define NFS4_TAG_LENGTH        12
 
 /* add NFSv4 COMPOUND header */
 #define NFS4_TAG_LENGTH        12

-#define nfsm_chain_add_compound_header(E, NMC, TAG, NUMOPS) \
+#define nfsm_chain_add_compound_header(E, NMC, TAG, MINOR, NUMOPS) \

        do { \
                if ((TAG) && strlen(TAG)) { \
                        /* put tags into a fixed-length space-padded field */ \
        do { \
                if ((TAG) && strlen(TAG)) { \
                        /* put tags into a fixed-length space-padded field */ \


@@ -444,7 +446,7 @@ int nfsm_chain_trim_data(struct nfsm_chain *, int, int *);
                } else { \
                        nfsm_chain_add_32((E), (NMC), 0); \
                } \
                } else { \
                        nfsm_chain_add_32((E), (NMC), 0); \
                } \

-               nfsm_chain_add_32((E), (NMC), 0); /*minorversion*/ \
+               nfsm_chain_add_32((E), (NMC), (MINOR)); /*minorversion*/ \

                nfsm_chain_add_32((E), (NMC), (NUMOPS)); \
        } while (0)
 
                nfsm_chain_add_32((E), (NMC), (NUMOPS)); \
        } while (0)