Skip to contentSkip to conversation

nfs: use memcpy_and_pad in decode_fh

PATCH New Thorsten Blum 1 participant 1 message Apr 5

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfs: use memcpy_and_pad in decode_fh

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

---
 fs/nfs/callback_xdr.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfs/callback_xdr.c +1 -2
index 176873f45677..4382baddc9ee 100644
@@ -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;
 }