From 50e01586f4b10dc7aa534bbfcd1707586e7b32e0 Mon Sep 17 00:00:00 2001 From: Mike Marshall Date: Tue, 29 Sep 2015 11:17:26 -0400 Subject: [PATCH] Orangefs: Don't opencode memcpy. Signed-off-by: Mike Marshall --- fs/orangefs/protocol.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h index c50c6e30f5a8..cdbde64f8e39 100644 --- a/fs/orangefs/protocol.h +++ b/fs/orangefs/protocol.h @@ -70,30 +70,21 @@ static inline int PVFS_khandle_cmp(const struct pvfs2_khandle *kh1, return 0; } -/* copy a khandle to a field of arbitrary size */ static inline void PVFS_khandle_to(const struct pvfs2_khandle *kh, void *p, int size) { - int i; - unsigned char *c = p; memset(p, 0, size); + memcpy(p, kh->u, 16); - for (i = 0; i < 16 && i < size; i++) - c[i] = kh->u[i]; } -/* copy a khandle from a field of arbitrary size */ static inline void PVFS_khandle_from(struct pvfs2_khandle *kh, void *p, int size) { - int i; - unsigned char *c = p; - memset(kh, 0, 16); + memcpy(kh->u, p, 16); - for (i = 0; i < 16 && i < size; i++) - kh->u[i] = c[i]; } /* pvfs2-types.h ************************************************************/ -- 2.39.5