hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sched/wait: Make the signal_pending() checks consistent 

There's two patterns to check signals in the __wait_event*() macros:

  if (!signal_pending(current)) {
	schedule();
	continue;
  }
  ret = -ERESTARTSYS;
  break;

And the more natural:

  if (signal_pending(current)) {
	ret = -ERESTARTSYS;
	break;
  }
  schedule();

Change them all into the latter form.

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092527.956416254@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2013-10-02 11:22:18 +02:00 committed by Ingo Molnar
parent 75f93fed50
commit 2f2a2b60ad
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/linux/tty.h
View File

@ -686,14 +686,13 @@ do { \
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
if (!signal_pending(current)) { \
tty_unlock(tty); \
schedule(); \
tty_lock(tty); \
continue; \
if (signal_pending(current)) { \
ret = -ERESTARTSYS; \
break; \
} \
ret = -ERESTARTSYS; \
break; \
tty_unlock(tty); \
schedule(); \
tty_lock(tty); \
} \
finish_wait(&wq, &__wait); \
} while (0)

35
include/linux/wait.h
View File

@ -261,12 +261,11 @@ do { \
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
if (!signal_pending(current)) { \
schedule(); \
continue; \
if (signal_pending(current)) { \
ret = -ERESTARTSYS; \
break; \
} \
ret = -ERESTARTSYS; \
break; \
schedule(); \
} \
finish_wait(&wq, &__wait); \
} while (0)
@ -302,14 +301,13 @@ do { \
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
if (!signal_pending(current)) { \
ret = schedule_timeout(ret); \
if (!ret) \
break; \
continue; \
if (signal_pending(current)) { \
ret = -ERESTARTSYS; \
break; \
} \
ret = -ERESTARTSYS; \
break; \
ret = schedule_timeout(ret); \
if (!ret) \
break; \
} \
if (!ret && (condition)) \
ret = 1; \
@ -439,14 +437,13 @@ do { \
finish_wait(&wq, &__wait); \
break; \
} \
if (!signal_pending(current)) { \
schedule(); \
continue; \
} \
ret = -ERESTARTSYS; \
abort_exclusive_wait(&wq, &__wait, \
if (signal_pending(current)) { \
ret = -ERESTARTSYS; \
abort_exclusive_wait(&wq, &__wait, \
TASK_INTERRUPTIBLE, NULL); \
break; \
break; \
} \
schedule(); \
} \
} while (0)