[PATCH v1 2/8] powerpc/uaccess: Swap clear_user() and __clear_user()

[Christophe Leroy]

It is clear_user() which is expected to call __clear_user(),
not the reverse.

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/include/asm/uaccess.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/include/asm/uaccess.h 
b/arch/powerpc/include/asm/uaccess.h
index 2c09cff205ef..1c1d404514b1 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -414,21 +414,20 @@ raw_copy_to_user(void __user *to, const void *from, 
unsigned long n)
 
 unsigned long __arch_clear_user(void __user *addr, unsigned long size);
 
-static inline unsigned long clear_user(void __user *addr, unsigned long size)
+static inline unsigned long __clear_user(void __user *addr, unsigned long size)
 {
-       unsigned long ret = size;
+       unsigned long ret;
+
        might_fault();
-       if (likely(access_ok(addr, size))) {
-               allow_write_to_user(addr, size);
-               ret = __arch_clear_user(addr, size);
-               prevent_write_to_user(addr, size);
-       }
+       allow_write_to_user(addr, size);
+       ret = __arch_clear_user(addr, size);
+       prevent_write_to_user(addr, size);
        return ret;
 }
 
-static inline unsigned long __clear_user(void __user *addr, unsigned long size)
+static inline unsigned long clear_user(void __user *addr, unsigned long size)
 {
-       return clear_user(addr, size);
+       return likely(access_ok(addr, size)) ? __clear_user(addr, size) : size;
 }
 
 extern long strncpy_from_user(char *dst, const char __user *src, long count);
-- 
2.25.0