Commit 43ea7036 authored by Thorsten Blum's avatar Thorsten Blum Committed by Trond Myklebust
Browse files

nfs: use memcpy_and_pad in decode_fh 



Use memcpy_and_pad() instead of memcpy() followed by memset() to
simplify decode_fh().

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 8c787b28

fs/nfs/callback_xdr.c

+1 −2
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ static __be32 decode_fh(struct xdr_stream *xdr, struct nfs_fh *fh) 
	p = xdr_inline_decode(xdr, fh->size);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	memcpy(&fh->data[0], p, fh->size);

	memset(&fh->data[fh->size], 0, sizeof(fh->data) - fh->size);

	memcpy_and_pad(fh->data, sizeof(fh->data), p, fh->size, 0);

	return 0;

}