Commit 2a89b674 authored by Al Viro's avatar Al Viro
Browse files

get rid of csum_partial_copy_to_user() 



For historical reasons some architectures call their csum_and_copy_to_user()
csum_partial_copy_to_user() instead (and supply a macro defining the
former as the latter).  That's the last remnants of old experiment that
went nowhere; time to bury them.  Rename those to csum_and_copy_to_user()
and get rid of the macros.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8f3d9f35

arch/sparc/include/asm/checksum_32.h

+3 −4
Original line number Diff line number Diff line
@@ -83,8 +83,10 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len, 
	return (__force __wsum)ret;

}



#define HAVE_CSUM_COPY_USER



static inline __wsum

csum_partial_copy_to_user(const void *src, void __user *dst, int len,

csum_and_copy_to_user(const void *src, void __user *dst, int len,

			  __wsum sum, int *err)

{

	if (!access_ok(dst, len)) {
@@ -113,9 +115,6 @@ csum_partial_copy_to_user(const void *src, void __user *dst, int len, 
	}

}



#define HAVE_CSUM_COPY_USER

#define csum_and_copy_to_user csum_partial_copy_to_user



/* ihl is always 5 or greater, almost always is 5, and iph is word aligned

 * the majority of the time.

 */

arch/x86/include/asm/checksum_64.h

+1 −3
Original line number Diff line number Diff line
@@ -141,13 +141,11 @@ extern __visible __wsum csum_partial_copy_generic(const void *src, const void *d 


extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,

					  int len, __wsum isum, int *errp);

extern __wsum csum_partial_copy_to_user(const void *src, void __user *dst,

extern __wsum csum_and_copy_to_user(const void *src, void __user *dst,

					int len, __wsum isum, int *errp);

extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,

					int len, __wsum sum);



/* Old names. To be removed. */

#define csum_and_copy_to_user csum_partial_copy_to_user

#define csum_and_copy_from_user csum_partial_copy_from_user



/**

arch/x86/lib/csum-wrappers_64.c

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ out_err: 
EXPORT_SYMBOL(csum_partial_copy_from_user);



/**

 * csum_partial_copy_to_user - Copy and checksum to user space.

 * csum_and_copy_to_user - Copy and checksum to user space.

 * @src: source address

 * @dst: destination address (user space)

 * @len: number of bytes to be copied.
@@ -82,7 +82,7 @@ EXPORT_SYMBOL(csum_partial_copy_from_user); 
 * src and dst are best aligned to 64bits.

 */

__wsum

csum_partial_copy_to_user(const void *src, void __user *dst,

csum_and_copy_to_user(const void *src, void __user *dst,

			  int len, __wsum isum, int *errp)

{

	__wsum ret;
@@ -116,7 +116,7 @@ csum_partial_copy_to_user(const void *src, void __user *dst, 
	clac();

	return ret;

}

EXPORT_SYMBOL(csum_partial_copy_to_user);

EXPORT_SYMBOL(csum_and_copy_to_user);



/**

 * csum_partial_copy_nocheck - Copy and checksum.

CRA Git | Maintained and supported by SUSTech CRA and CCSE