From: Baolin Wang <baolin.wang@linaro.org>
To: tglx@linutronix.de
Cc: pang.xunlei@linaro.org, peterz@infradead.org,
heiko.carstens@de.ibm.com, paulus@samba.org, cl@linux.com,
heenasirwani@gmail.com, linux-arch@vger.kernel.org,
linux-s390@vger.kernel.org, y2038@lists.linaro.org,
rafael.j.wysocki@intel.com, ahh@google.com, fweisbec@gmail.com,
pjt@google.com, riel@redhat.com, arnd@arndb.de,
richardcochran@gmail.com, schwidefsky@de.ibm.com,
john.stultz@linaro.org, rth@twiddle.net, baolin.wang@linaro.org,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, tj@kernel.org, linux390@de.ibm.com,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 11/11] k_clock:Remove the 32bit methods with timespec type
Date: Mon, 20 Apr 2015 13:57:39 +0800 [thread overview]
Message-ID: <1429509459-17068-12-git-send-email-baolin.wang@linaro.org> (raw)
In-Reply-To: <1429509459-17068-1-git-send-email-baolin.wang@linaro.org>
All of the k_clock users have been converted to the new methods. This patch
removes the older methods with timepsec/itimerspec type. As a result, the k_clock
structure is ready for the year 2038.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
include/linux/posix-timers.h | 9 ------
kernel/time/posix-timers.c | 72 +++++++++++++++++-------------------------
2 files changed, 29 insertions(+), 52 deletions(-)
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 35786c5..7c3dae2 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -97,29 +97,20 @@ struct k_itimer {
};
struct k_clock {
- int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
int (*clock_getres64) (const clockid_t which_clock, struct timespec64 *tp);
- int (*clock_set) (const clockid_t which_clock,
- const struct timespec *tp);
int (*clock_set64) (const clockid_t which_clock,
const struct timespec64 *tp);
- int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
int (*clock_get64) (const clockid_t which_clock, struct timespec64 *tp);
int (*clock_adj) (const clockid_t which_clock, struct timex *tx);
int (*timer_create) (struct k_itimer *timer);
int (*nsleep) (const clockid_t which_clock, int flags,
struct timespec *, struct timespec __user *);
long (*nsleep_restart) (struct restart_block *restart_block);
- int (*timer_set) (struct k_itimer * timr, int flags,
- struct itimerspec * new_setting,
- struct itimerspec * old_setting);
int (*timer_set64) (struct k_itimer *timr, int flags,
struct itimerspec64 *new_setting,
struct itimerspec64 *old_setting);
int (*timer_del) (struct k_itimer * timr);
#define TIMER_RETRY 1
- void (*timer_get) (struct k_itimer * timr,
- struct itimerspec * cur_setting);
void (*timer_get64) (struct k_itimer *timr,
struct itimerspec64 *cur_setting);
};
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 47d1abf..3196ec0 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -528,13 +528,13 @@ void posix_timers_register_clock(const clockid_t clock_id,
return;
}
- if (!new_clock->clock_get && !new_clock->clock_get64) {
- printk(KERN_WARNING "POSIX clock id %d lacks clock_get() and clock_get64()\n",
+ if (!new_clock->clock_get64) {
+ printk(KERN_WARNING "POSIX clock id %d lacks clock_get64()\n",
clock_id);
return;
}
- if (!new_clock->clock_getres && !new_clock->clock_getres64) {
- printk(KERN_WARNING "POSIX clock id %d lacks clock_getres() and clock_getres64()\n",
+ if (!!new_clock->clock_getres64) {
+ printk(KERN_WARNING "POSIX clock id %d lacks clock_getres64()\n",
clock_id);
return;
}
@@ -585,7 +585,7 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
return (id & CLOCKFD_MASK) == CLOCKFD ?
&clock_posix_dynamic : &clock_posix_cpu;
- if (id >= MAX_CLOCKS || (!posix_clocks[id].clock_getres && !posix_clocks[id].clock_getres64))
+ if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres64)
return NULL;
return &posix_clocks[id];
}
@@ -788,15 +788,11 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
return -EINVAL;
kc = clockid_to_kclock(timr->it_clock);
- if (WARN_ON_ONCE(!kc || (!kc->timer_get && !kc->timer_get64))) {
+ if (WARN_ON_ONCE(!kc || !kc->timer_get64)) {
ret = -EINVAL;
} else {
- if (kc->timer_get64) {
- kc->timer_get64(timr, &cur_setting64);
- cur_setting = itimerspec64_to_itimerspec(cur_setting64);
- } else {
- kc->timer_get(timr, &cur_setting);
- }
+ kc->timer_get64(timr, &cur_setting64);
+ cur_setting = itimerspec64_to_itimerspec(cur_setting64);
}
unlock_timer(timr, flags);
@@ -911,18 +907,14 @@ retry:
return -EINVAL;
kc = clockid_to_kclock(timr->it_clock);
- if (WARN_ON_ONCE(!kc || (!kc->timer_set && !kc->timer_set64))) {
+ if (WARN_ON_ONCE(!kc || !kc->timer_set64)) {
error = -EINVAL;
} else {
- if (kc->timer_set64) {
- new_spec64 = itimerspec_to_itimerspec64(new_spec);
- error = kc->timer_set64(timr, flags, &new_spec64,
- &old_spec64);
- if (old_setting)
- old_spec = itimerspec64_to_itimerspec(old_spec64);
- } else {
- error = kc->timer_set(timr, flags, &new_spec, rtn);
- }
+ new_spec64 = itimerspec_to_itimerspec64(new_spec);
+ error = kc->timer_set64(timr, flags, &new_spec64,
+ &old_spec64);
+ if (old_setting)
+ old_spec = itimerspec64_to_itimerspec(old_spec64);
}
unlock_timer(timr, flag);
@@ -1032,18 +1024,14 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
struct timespec new_tp;
struct timespec64 new_tp64;
- if (!kc || (!kc->clock_set && !kc->clock_set64))
+ if (!kc || !kc->clock_set64)
return -EINVAL;
if (copy_from_user(&new_tp, tp, sizeof (*tp)))
return -EFAULT;
- if (kc->clock_set64) {
- new_tp64 = timespec_to_timespec64(new_tp);
- return kc->clock_set64(which_clock, &new_tp64);
- } else {
- return kc->clock_set(which_clock, &new_tp);
- }
+ new_tp64 = timespec_to_timespec64(new_tp);
+ return kc->clock_set64(which_clock, &new_tp64);
}
SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
@@ -1057,14 +1045,13 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
if (!kc)
return -EINVAL;
- if (kc->clock_get64) {
- error = kc->clock_get64(which_clock, &kernel_tp64);
- kernel_tp = timespec64_to_timespec(kernel_tp64);
- } else {
- error = kc->clock_get(which_clock, &kernel_tp);
- }
+ error = kc->clock_get64(which_clock, &kernel_tp64);
+ if (!error)
+ return error;
+
+ kernel_tp = timespec64_to_timespec(kernel_tp64);
- if (!error && copy_to_user(tp, &kernel_tp, sizeof (kernel_tp)))
+ if (copy_to_user(tp, &kernel_tp, sizeof (kernel_tp)))
error = -EFAULT;
return error;
@@ -1104,14 +1091,13 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
if (!kc)
return -EINVAL;
- if (kc->clock_getres64) {
- error = kc->clock_getres64(which_clock, &rtn_tp64);
- rtn_tp = timespec64_to_timespec(rtn_tp64);
- } else {
- error = kc->clock_getres(which_clock, &rtn_tp);
- }
+ error = kc->clock_getres64(which_clock, &rtn_tp64);
+ if (!error)
+ return error;
+
+ rtn_tp = timespec64_to_timespec(rtn_tp64);
- if (!error && tp && copy_to_user(tp, &rtn_tp, sizeof (rtn_tp)))
+ if (tp && copy_to_user(tp, &rtn_tp, sizeof (rtn_tp)))
error = -EFAULT;
return error;
--
1.7.9.5
next prev parent reply other threads:[~2015-04-20 5:59 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 5:57 [PATCH 00/11] Convert the posix_clock_operations and k_clock structure to ready for 2038 Baolin Wang
2015-04-20 5:57 ` [PATCH 01/11] linux/time64.h:Introduce the 'struct itimerspec64' for 64bit Baolin Wang
2015-04-20 9:49 ` Sergei Shtylyov
2015-04-20 10:55 ` Baolin Wang
2015-04-20 19:14 ` Thomas Gleixner
2015-04-20 19:59 ` Thomas Gleixner
2015-04-21 8:19 ` Baolin Wang
2015-04-20 5:57 ` [PATCH 02/11] timekeeping:Introduce the current_kernel_time64() function with timespec64 type Baolin Wang
2015-04-20 5:57 ` [PATCH 03/11] time/hrtimer:Introduce hrtimer_get_res64() with timespec64 type for getting the timer resolution Baolin Wang
2015-04-20 19:15 ` Thomas Gleixner
2015-04-20 5:57 ` [PATCH 04/11] posix timers:Introduce the 64bit methods with timespec64 type for k_clock structure Baolin Wang
2015-04-20 20:40 ` Thomas Gleixner
2015-04-21 8:59 ` [Y2038] " Arnd Bergmann
2015-04-21 14:14 ` Thomas Gleixner
2015-04-21 14:57 ` Arnd Bergmann
2015-04-21 15:13 ` Thomas Gleixner
2015-04-21 15:40 ` Arnd Bergmann
2015-04-21 20:13 ` Thomas Gleixner
2015-04-22 8:45 ` Thomas Gleixner
2015-04-22 10:11 ` Richard Cochran
2015-04-22 10:44 ` David Laight
2015-04-22 11:07 ` Arnd Bergmann
2015-04-22 13:37 ` Thomas Gleixner
2015-04-22 13:50 ` Arnd Bergmann
2015-04-22 14:54 ` Richard Cochran
2015-04-22 15:37 ` Arnd Bergmann
2015-04-22 15:14 ` Luc Van Oostenryck
2015-04-22 15:38 ` Arnd Bergmann
2015-04-20 5:57 ` [PATCH 05/11] time/posix-timers:Convert to the 64bit methods for k_clock callback functions Baolin Wang
2015-04-20 20:48 ` Thomas Gleixner
2015-04-21 8:36 ` Baolin Wang
2015-04-21 8:45 ` [Y2038] " Arnd Bergmann
2015-04-21 8:55 ` Baolin Wang
2015-04-20 5:57 ` [PATCH 06/11] char/mmtimer:Convert to the 64bit methods for k_clock callback function Baolin Wang
2015-04-20 5:57 ` [PATCH 07/11] time/alarmtimer:Convert to the new methods for k_clock structure Baolin Wang
2015-04-20 5:57 ` [PATCH 08/11] time/posix-clock:Convert to the 64bit methods for k_clock and posix_clock_operations structure Baolin Wang
2015-04-20 5:57 ` [PATCH 09/11] cputime:Introduce the cputime_to_timespec64/timespec64_to_cputime function Baolin Wang
2015-04-20 21:09 ` Thomas Gleixner
2015-04-20 5:57 ` [PATCH 10/11] time/posix-cpu-timers:Convert to the 64bit methods for k_clock structure Baolin Wang
2015-04-20 5:57 ` Baolin Wang [this message]
2015-04-20 8:42 ` [PATCH 11/11] k_clock:Remove the 32bit methods with timespec type Richard Cochran
2015-04-20 9:00 ` 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=1429509459-17068-12-git-send-email-baolin.wang@linaro.org \
--to=baolin.wang@linaro.org \
--cc=ahh@google.com \
--cc=arnd@arndb.de \
--cc=cl@linux.com \
--cc=fweisbec@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=heenasirwani@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=john.stultz@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux390@de.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=pang.xunlei@linaro.org \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=rafael.j.wysocki@intel.com \
--cc=richardcochran@gmail.com \
--cc=riel@redhat.com \
--cc=rth@twiddle.net \
--cc=schwidefsky@de.ibm.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).