[PATCH] kNFSd: Make the calculation in the first READ_BUF easier to understand.

From: NeilBrown <neilb@cse.unsw.edu.au>

Don't rely on the assumption that
    sizeof(stateid_t) == sizeof(stateid_opaque_t) + 4.

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 81407d2f82f3a427b24517aff3660d377ce3254a..d19b1c6b7f45566f30cd7d4a19f1a067e19c341e 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -949,7 +949,7 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write)
        int len;
        DECODE_HEAD;
 
-       READ_BUF(sizeof(stateid_t) + 16);
+       READ_BUF(sizeof(stateid_opaque_t) + 20);
        READ32(write->wr_stateid.si_generation);
        COPYMEM(&write->wr_stateid.si_opaque, sizeof(stateid_opaque_t));
        READ64(write->wr_offset);