From e2d8e8c24c391a779aca009f1f5589ae335c3dfd Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 13 May 2015 16:50:09 +0200 Subject: mem: Fix memcpy_sz variable types - Drop usage of 'ulong', use unsigned long - remove unnecessary intermediate casting to unsigned long - Use proper u8/u16/u32 types. Fixes 64bit systems on which ulong is 64bit Signed-off-by: Sascha Hauer --- fs/fs.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'fs') diff --git a/fs/fs.c b/fs/fs.c index 779f2641b2..a056d83d3d 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -1564,14 +1564,11 @@ out: } EXPORT_SYMBOL(rmdir); -static void memcpy_sz(void *_dst, const void *_src, ulong count, ulong rwsize) +static void memcpy_sz(void *dst, const void *src, size_t count, int rwsize) { - ulong dst = (ulong)_dst; - ulong src = (ulong)_src; - /* no rwsize specification given. Do whatever memcpy likes best */ if (!rwsize) { - memcpy(_dst, _src, count); + memcpy(dst, src, count); return; } @@ -1582,13 +1579,13 @@ static void memcpy_sz(void *_dst, const void *_src, ulong count, ulong rwsize) while (count-- > 0) { switch (rwsize) { case 1: - *((u_char *)dst) = *((u_char *)src); + *((u8 *)dst) = *((u8 *)src); break; case 2: - *((ushort *)dst) = *((ushort *)src); + *((u16 *)dst) = *((u16 *)src); break; case 4: - *((ulong *)dst) = *((ulong *)src); + *((u32 *)dst) = *((u32 *)src); break; } dst += rwsize; -- cgit v1.2.3