mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Baolin Wang <baolin.wang@linaro.org>
To: tglx@linutronix.de
Cc: arnd@arndb.de, linux-kernel@vger.kernel.org,
	baolin.wang@linaro.org, y2038@lists.linaro.org
Subject: [PATCH v5 06/24] posix-timers: Factor out the guts of 'timer_gettime' for reusing
Date: Fri, 12 Jun 2015 15:48:21 +0800	[thread overview]
Message-ID: <320d585c9cc4bbbda014f0a2bdcd55fe69b347cc.1434079263.git.baolin.wang@linaro.org> (raw)
In-Reply-To: <647dcc7ede88d9d95a6f9a2878487d46c233fb2a.1434079262.git.baolin.wang@linaro.org>
In-Reply-To: <cover.1434079262.git.baolin.wang@linaro.org>

In order to reuse the very same logic for the year 2038 safe syscalls
which we need to introduce for 32bit systems, factor out the guts of
the 'timer_gettime' syscall.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 kernel/time/posix-timers.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 5ddd912..7d1973a 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -802,11 +802,8 @@ common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting)
 		cur_setting->it_value = ktime_to_timespec(remaining);
 }
 
-/* Get the time remaining on a POSIX.1b interval timer. */
-SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
-		struct itimerspec __user *, setting)
+static int __timer_gettime(timer_t timer_id, struct itimerspec *cur_setting)
 {
-	struct itimerspec cur_setting;
 	struct k_itimer *timr;
 	struct k_clock *kc;
 	unsigned long flags;
@@ -820,9 +817,18 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
 	if (WARN_ON_ONCE(!kc || !kc->timer_get))
 		ret = -EINVAL;
 	else
-		kc->timer_get(timr, &cur_setting);
+		kc->timer_get(timr, cur_setting);
 
 	unlock_timer(timr, flags);
+	return ret;
+}
+
+/* Get the time remaining on a POSIX.1b interval timer. */
+SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
+		struct itimerspec __user *, setting)
+{
+	struct itimerspec cur_setting;
+	int ret = __timer_gettime(timer_id, &cur_setting);
 
 	if (!ret && copy_to_user(setting, &cur_setting, sizeof (cur_setting)))
 		return -EFAULT;
-- 
1.7.9.5


  parent reply	other threads:[~2015-06-12  7:49 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <lfywpz1987>
2015-06-12  7:19 ` [PATCH v5 00/24] Convert the posix_clock_operations and k_clock structure to ready for 2038 Baolin Wang
2015-06-12  7:27   ` [PATCH v5 01/24] time: Introduce struct itimerspec64 Baolin Wang
2015-06-12  7:30   ` [PATCH v5 02/24] timekeeping: Introduce current_kernel_time64() Baolin Wang
2015-06-12  7:37   ` [PATCH v5 03/24] security: Introduce security_settime64() Baolin Wang
2015-06-12  7:44   ` [PATCH v5 04/24] time: Introduce do_sys_settimeofday64() Baolin Wang
2015-06-12  7:48   ` [PATCH v5 05/24] posix-timers: Introduce {get,put}_timespec and {get,put}_itimerspec Baolin Wang
2015-06-12  7:48   ` Baolin Wang [this message]
2015-06-12  7:48   ` [PATCH v5 07/24] posix-timers: Implement y2038 safe timer_get64() callback Baolin Wang
2015-06-12  7:48   ` [PATCH v5 08/24] posix-timers: Factor out the guts of 'timer_settime' for reusing Baolin Wang
2015-06-12  7:48   ` [PATCH v5 09/24] posix-timers: Implement y2038 safe timer_set64() callback Baolin Wang
2015-06-12  7:48   ` [PATCH v5 10/24] posix-timers: Factor out the guts of 'clock_settime' for reusing Baolin Wang
2015-06-12  7:48   ` [PATCH v5 11/24] posix-timers: Implement y2038 safe clock_set64() callback Baolin Wang
2015-06-12  7:48   ` [PATCH v5 12/24] posix-timers: Factor out the guts of 'clock_gettime' for reusing Baolin Wang
2015-06-12  7:48   ` [PATCH v5 13/24] posix-timers: Implement y2038 safe clock_get64() callback Baolin Wang
2015-06-12  7:48   ` [PATCH v5 14/24] posix-timers: Factor out the guts of 'clcok_getres' for reusing Baolin Wang
2015-06-12  7:48   ` [PATCH v5 15/24] posix-timers: Implement y2038 safe clock_getres64() callback Baolin Wang
2015-06-12  7:53   ` [PATCH v5 16/24] timekeeping: Change the implementation of timekeeping_clocktai() Baolin Wang
2015-06-12  7:56   ` [PATCH v5 17/24] posix-timers: Convert to y2038 safe callbacks Baolin Wang
2015-06-12  7:58   ` [PATCH v5 18/24] mmtimer: " Baolin Wang
2015-06-12  8:00   ` [PATCH v5 19/24] alarmtimer: " Baolin Wang
2015-06-12  8:03   ` [PATCH v5 20/24] posix-clock: " Baolin Wang
2015-06-12  8:06   ` [PATCH v5 21/24] time: Introduce timespec64_to_jiffies()/jiffies_to_timespec64() Baolin Wang
2015-06-12  8:10   ` [PATCH v5 22/24] cputime: Introduce cputime_to_timespec64()/timespec64_to_cputime() Baolin Wang
2015-06-12  8:12   ` [PATCH v5 23/24] posix-cpu-timers: Convert to y2038 safe callbacks Baolin Wang
2015-06-12  8:12   ` [PATCH v5 24/24] k_clock: Remove y2038 unsafe callbacks Baolin Wang
2015-06-12 13:16   ` [PATCH v5 00/24] Convert the posix_clock_operations and k_clock structure to ready for 2038 Thomas Gleixner
2015-06-15  2:27     ` Baolin Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=320d585c9cc4bbbda014f0a2bdcd55fe69b347cc.1434079263.git.baolin.wang@linaro.org \
    --to=baolin.wang@linaro.org \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=y2038@lists.linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®