Commit 16932237 authored Dec 16, 2013 by Dave Kleikamp Committed by David S. Miller Jan 04, 2014

Revert "sparc64: Fix __copy_{to,from}_user_inatomic defines."



This reverts commit 145e1c00.

This commit broke the behavior of __copy_from_user_inatomic when
it is only partially successful. Instead of returning the number
of bytes not copied, it now returns 1. This translates to the
wrong value being returned by iov_iter_copy_from_user_atomic.

xfstests generic/246 and LTP writev01 both fail on btrfs and nfs
because of this.

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ce2521bf

arch/sparc/include/asm/uaccess_64.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -262,8 +262,8 @@ extern unsigned long __must_check __clear_user(void __user *, unsigned long);
		extern __must_check long strlen_user(const char __user *str);
		extern __must_check long strnlen_user(const char __user *str, long n);

		#define __copy_to_user_inatomic ___copy_to_user
		#define __copy_from_user_inatomic ___copy_from_user
		#define __copy_to_user_inatomic __copy_to_user
		#define __copy_from_user_inatomic __copy_from_user

		struct pt_regs;
		extern unsigned long compute_effective_address(struct pt_regs *,