fs: add do_compat_futimesat() helper; remove in-kernel call to compat syscall

[sfrench/cifs-2.6.git] / fs / utimes.c

diff --git a/fs/utimes.c b/fs/utimes.c
index 5be035ed26c0b2470278f14ace71bf2f33b0130f..69d4b6ba1bfb685489e27f06b21d94c95aa7f2a0 100644 (file)
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -260,7 +260,8 @@ COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filena
        return do_utimes(dfd, filename, t ? tv : NULL, flags);
 }
 
-COMPAT_SYSCALL_DEFINE3(futimesat, unsigned int, dfd, const char __user *, filename, struct compat_timeval __user *, t)
+static long do_compat_futimesat(unsigned int dfd, const char __user *filename,
+                               struct compat_timeval __user *t)
 {
        struct timespec64 tv[2];
 
@@ -279,8 +280,15 @@ COMPAT_SYSCALL_DEFINE3(futimesat, unsigned int, dfd, const char __user *, filena
        return do_utimes(dfd, filename, t ? tv : NULL, 0);
 }
 
+COMPAT_SYSCALL_DEFINE3(futimesat, unsigned int, dfd,
+                      const char __user *, filename,
+                      struct compat_timeval __user *, t)
+{
+       return do_compat_futimesat(dfd, filename, t);
+}
+
 COMPAT_SYSCALL_DEFINE2(utimes, const char __user *, filename, struct compat_timeval __user *, t)
 {
-       return compat_sys_futimesat(AT_FDCWD, filename, t);
+       return do_compat_futimesat(AT_FDCWD, filename, t);
 }
 #endif