Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3751f9f2 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Cleanup restart_block usage 



posix timers still use the legacy arg0-arg3 members of
restart_block. Use restart_block.nanosleep instead

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Tested-by: default avatarRichard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134418.232288779@linutronix.de>
parent 59bd5bc2

kernel/posix-cpu-timers.c

+15 −23
Original line number Diff line number Diff line
@@ -1506,45 +1506,37 @@ int posix_cpu_nsleep(const clockid_t which_clock, int flags, 
		/*

		 * Report back to the user the time still remaining.

		 */

		if (rmtp != NULL && copy_to_user(rmtp, &it.it_value, sizeof *rmtp))

		if (rmtp && copy_to_user(rmtp, &it.it_value, sizeof *rmtp))

			return -EFAULT;



		restart_block->fn = posix_cpu_nsleep_restart;

		restart_block->arg0 = which_clock;

		restart_block->arg1 = (unsigned long) rmtp;

		restart_block->arg2 = rqtp->tv_sec;

		restart_block->arg3 = rqtp->tv_nsec;

		restart_block->nanosleep.index = which_clock;

		restart_block->nanosleep.rmtp = rmtp;

		restart_block->nanosleep.expires = timespec_to_ns(rqtp);

	}

	return error;

}



long posix_cpu_nsleep_restart(struct restart_block *restart_block)

{

	clockid_t which_clock = restart_block->arg0;

	struct timespec __user *rmtp;

	clockid_t which_clock = restart_block->nanosleep.index;

	struct timespec t;

	struct itimerspec it;

	int error;



	rmtp = (struct timespec __user *) restart_block->arg1;

	t.tv_sec = restart_block->arg2;

	t.tv_nsec = restart_block->arg3;

	t = ns_to_timespec(restart_block->nanosleep.expires);



	restart_block->fn = do_no_restart_syscall;

	error = do_cpu_nanosleep(which_clock, TIMER_ABSTIME, &t, &it);



	if (error == -ERESTART_RESTARTBLOCK) {

		struct timespec __user *rmtp = restart_block->nanosleep.rmtp;

		/*

		 * Report back to the user the time still remaining.

		 */

		if (rmtp != NULL && copy_to_user(rmtp, &it.it_value, sizeof *rmtp))

		if (rmtp && copy_to_user(rmtp, &it.it_value, sizeof *rmtp))

			return -EFAULT;



		restart_block->fn = posix_cpu_nsleep_restart;

		restart_block->arg0 = which_clock;

		restart_block->arg1 = (unsigned long) rmtp;

		restart_block->arg2 = t.tv_sec;

		restart_block->arg3 = t.tv_nsec;

		restart_block->nanosleep.expires = timespec_to_ns(&t);

	}

	return error;

kernel/posix-timers.c

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, 
 */

long clock_nanosleep_restart(struct restart_block *restart_block)

{

	clockid_t which_clock = restart_block->arg0;

	clockid_t which_clock = restart_block->nanosleep.index;

	struct k_clock *kc = clockid_to_kclock(which_clock);



	if (WARN_ON_ONCE(!kc || !kc->nsleep_restart))