[PATCH v4 05/25] time:Introduce the do_sys_settimeofday64() function with timespec64 type

[PATCH v4 05/25] time:Introduce the do_sys_settimeofday64() function with timespec64 type

[Baolin Wang]

Introduce the do_sys_settimeofday64() function with timespec64 type to make
it is ready for 2038 issue when setting the time of day.

And move the do_sys_settimeofday() function to the timekeeping.h file, that it
is convenient to delete it later.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 include/linux/timekeeping.h |   12 ++++++++++--
 kernel/time/time.c          |    8 ++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index c6d5ae9..89beb62 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -11,8 +11,16 @@ extern int timekeeping_suspended;
  */
 extern void do_gettimeofday(struct timeval *tv);
 extern int do_settimeofday64(const struct timespec64 *ts);
-extern int do_sys_settimeofday(const struct timespec *tv,
-			       const struct timezone *tz);
+extern int do_sys_settimeofday64(const struct timespec64 *tv,
+				 const struct timezone *tz);
+static inline int do_sys_settimeofday(const struct timespec *tv,
+				      const struct timezone *tz)
+{
+	struct timespec64 ts64;
+
+	ts64 = timespec_to_timespec64(*tv);
+	return do_sys_settimeofday64(&ts64, tz);
+}
 
 /*
  * Kernel time accessors
diff --git a/kernel/time/time.c b/kernel/time/time.c
index 2c85b77..33c539b 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -160,15 +160,15 @@ static inline void warp_clock(void)
  * various programs will get confused when the clock gets warped.
  */
 
-int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
+int do_sys_settimeofday64(const struct timespec64 *tv, const struct timezone *tz)
 {
 	static int firsttime = 1;
 	int error = 0;
 
-	if (tv && !timespec_valid(tv))
+	if (tv && !timespec64_valid(tv))
 		return -EINVAL;
 
-	error = security_settime(tv, tz);
+	error = security_settime64(tv, tz);
 	if (error)
 		return error;
 
@@ -182,7 +182,7 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
 		}
 	}
 	if (tv)
-		return do_settimeofday(tv);
+		return do_settimeofday64(tv);
 	return 0;
 }
 
-- 
1.7.9.5

Re: [PATCH v4 05/25] time:Introduce the do_sys_settimeofday64() function with timespec64 type

[Thomas Gleixner]

On Mon, 1 Jun 2015, Baolin Wang wrote:

Subject line sucks.

> Introduce the do_sys_settimeofday64() function with timespec64 type to make
> it is ready for 2038 issue when setting the time of day.
> 
> And move the do_sys_settimeofday() function to the timekeeping.h file, that it
> is convenient to delete it later.

See other mails.
 
>  extern void do_gettimeofday(struct timeval *tv);
>  extern int do_settimeofday64(const struct timespec64 *ts);
> -extern int do_sys_settimeofday(const struct timespec *tv,
> -			       const struct timezone *tz);
> +extern int do_sys_settimeofday64(const struct timespec64 *tv,
> +				 const struct timezone *tz);
> +static inline int do_sys_settimeofday(const struct timespec *tv,
> +				      const struct timezone *tz)
> +{
> +	struct timespec64 ts64;
> +
> +	ts64 = timespec_to_timespec64(*tv);
> +	return do_sys_settimeofday64(&ts64, tz);


If you write it:

	struct timespec64 ts64 = timespec_to_timespec64(*tv);

	return do_sys_settimeofday64(&ts64, tz);
       
You spare a line per inline function. Applies to the other patches as well.

>  
> -int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
> +int do_sys_settimeofday64(const struct timespec64 *tv, const struct timezone *tz)
>  {
>  	static int firsttime = 1;
>  	int error = 0;
>  
> -	if (tv && !timespec_valid(tv))
> +	if (tv && !timespec64_valid(tv))
>  		return -EINVAL;
>  
> -	error = security_settime(tv, tz);
> +	error = security_settime64(tv, tz);

No such function. Fails to build.

Thanks,

	tglx