posix-cpu-timers: Replace cpu_timer_pid_type with clock_pid_type
authorEric W. Biederman <ebiederm@xmission.com>
Mon, 27 Apr 2020 14:38:29 +0000 (09:38 -0500)
committerEric W. Biederman <ebiederm@xmission.com>
Wed, 29 Apr 2020 12:14:51 +0000 (07:14 -0500)
Taking a clock and returning a pid_type is a more general and
a superset of taking a timer and returning a pid_type.

Perform this generalization so that future changes may use
this code on clocks as well as timers.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
kernel/time/posix-cpu-timers.c

index 91996dd089a48dcd4321625a46d5792903308724..42f673974d71229c331ce646f4525ccb51faf79c 100644 (file)
@@ -113,14 +113,14 @@ static inline int validate_clock_permissions(const clockid_t clock)
        return ret;
 }
 
-static inline enum pid_type cpu_timer_pid_type(struct k_itimer *timer)
+static inline enum pid_type clock_pid_type(const clockid_t clock)
 {
-       return CPUCLOCK_PERTHREAD(timer->it_clock) ? PIDTYPE_PID : PIDTYPE_TGID;
+       return CPUCLOCK_PERTHREAD(clock) ? PIDTYPE_PID : PIDTYPE_TGID;
 }
 
 static inline struct task_struct *cpu_timer_task_rcu(struct k_itimer *timer)
 {
-       return pid_task(timer->it.cpu.pid, cpu_timer_pid_type(timer));
+       return pid_task(timer->it.cpu.pid, clock_pid_type(timer->it_clock));
 }
 
 /*
@@ -403,7 +403,7 @@ static int posix_cpu_timer_create(struct k_itimer *new_timer)
 
        new_timer->kclock = &clock_posix_cpu;
        timerqueue_init(&new_timer->it.cpu.node);
-       new_timer->it.cpu.pid = get_task_pid(p, cpu_timer_pid_type(new_timer));
+       new_timer->it.cpu.pid = get_task_pid(p, clock_pid_type(new_timer->it_clock));
        rcu_read_unlock();
        return 0;
 }