diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-20 11:41:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-20 11:41:51 +1000 |
| commit | 795a5c889ee4cd86c8beb810381f6f0215821886 (patch) | |
| tree | d576319e3a8262ea198d6ccff1d8c3e888226266 /fs/nfsd/nfs4xdr.c | |
| parent | eb6fc5fa191cf87f3fb0752996c2ce746d64a458 (diff) | |
| parent | b49ad762228c26cbbc31d450a362f3a668c000d0 (diff) | |
Merge commit 'nfsd/nfsd-next'
Conflicts:
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/svc.c
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index c513bbdf2d36..9547ab636274 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1201,7 +1201,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) *p++ = htonl((u32)((n) >> 32)); \ *p++ = htonl((u32)(n)); \ } while (0) -#define WRITEMEM(ptr,nbytes) do { \ +#define WRITEMEM(ptr,nbytes) do if (nbytes > 0) { \ *(p + XDR_QUADLEN(nbytes) -1) = 0; \ memcpy(p, ptr, nbytes); \ p += XDR_QUADLEN(nbytes); \ |