hrtimer_nanosleep_restart: don't play with restart_block->fn
PATCH 5/5 hrtimer_nanosleep_restart: don't play with restart_block->fn
hrtimer_nanosleep_restart() clears/restores restart_block->fn. This is pointless and complicates its usage. Note that if sys_restart_syscall() doesn't actually happen, we have a bogus "pending" restart->fn anyway, this is harmless.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/hrtimer.c renamed from kernel/hrtimer.c~5_RESTART_FN +0 -4
@@ -1338,8 +1338,6 @@ long __sched hrtimer_nanosleep_restart(sstruct hrtimer_sleeper t;struct timespec __user *rmtp; - restart->fn = do_no_restart_syscall; -hrtimer_init (&t.timer, restart->arg0,HRTIMER_MODE_ABS ); t.timer.expires.tv64 = ((u64 )restart->arg3 <<32 ) | (u64 ) restart->arg2;
@@ -1353,8 +1351,6 @@ long __sched hrtimer_nanosleep_restart(sreturn ret; } - restart->fn = hrtimer_nanosleep_restart; -/* The other values in restart are already filled in */ return -ERESTART_RESTARTBLOCK ; }
kernel/compat.c renamed from kernel/compat.c~5_RESTART_FN +1 -3
@@ -57,10 +57,8 @@ static long compat_nanosleep_restart(strif (rmtp &&put_compat_timespec (&tu, rmtp))return -EFAULT ; -if (err == -ERESTART_RESTARTBLOCK ) { - restart->fn = compat_nanosleep_restart; +if (err == -ERESTART_RESTARTBLOCK ) restart->arg1 = (unsigned long )rmtp; - } }return err;
Re-diff. Once again, my apologies to all for the noise.
[PATCH 5/5] hrtimer_nanosleep_restart: don't play with restart_block->fn
hrtimer_nanosleep_restart() clears/restores restart_block->fn. This is pointless and complicates its usage. Note that if sys_restart_syscall() doesn't actually happen, we have a bogus "pending" restart->fn anyway, this is harmless.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/hrtimer.c renamed from kernel/hrtimer.c~x5_RESTART_FN +0 -4
@@ -1338,8 +1338,6 @@ long __sched hrtimer_nanosleep_restart(sstruct hrtimer_sleeper t;struct timespec __user *rmtp; - restart->fn = do_no_restart_syscall; -hrtimer_init (&t.timer, restart->arg0,HRTIMER_MODE_ABS ); t.timer.expires.tv64 = ((u64 )restart->arg3 <<32 ) | (u64 ) restart->arg2;
@@ -1353,8 +1351,6 @@ long __sched hrtimer_nanosleep_restart(sreturn ret; } - restart->fn = hrtimer_nanosleep_restart; -/* The other values in restart are already filled in */ return -ERESTART_RESTARTBLOCK ; }
kernel/compat.c renamed from kernel/compat.c~x5_RESTART_FN +0 -1
@@ -54,7 +54,6 @@ static long compat_nanosleep_restart(strset_fs (oldfs);if (ret) { - restart->fn = compat_nanosleep_restart; restart->arg1 = (unsigned long )rmtp;if (rmtp &&put_compat_timespec (&rmt, rmtp))