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

Commit 2f2a2b60 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092527.956416254@infradead.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 75f93fed

include/linux/tty.h

+6 −7
Original line number Original line Diff line number Diff line
@@ -686,14 +686,13 @@ do { \ 
		prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);	\

		prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);	\

		if (condition)						\

		if (condition)						\

			break;						\

			break;						\

		if (!signal_pending(current)) {				\

		if (signal_pending(current)) {				\

			ret = -ERESTARTSYS;				\

			break;						\

		}							\

		tty_unlock(tty);					\

		tty_unlock(tty);					\

		schedule();						\

		schedule();						\

		tty_lock(tty);						\

		tty_lock(tty);						\

			continue;					\

		}							\

		ret = -ERESTARTSYS;					\

		break;							\

	}								\

	}								\

	finish_wait(&wq, &__wait);					\

	finish_wait(&wq, &__wait);					\

} while (0)

} while (0)

include/linux/wait.h

+16 −19
Original line number Original line Diff line number Diff line
@@ -261,13 +261,12 @@ do { \ 
		prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);	\

		prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);	\

		if (condition)						\

		if (condition)						\

			break;						\

			break;						\

		if (!signal_pending(current)) {				\

		if (signal_pending(current)) {				\

			schedule();					\

			continue;					\

		}							\

			ret = -ERESTARTSYS;				\

			ret = -ERESTARTSYS;				\

			break;						\

			break;						\

		}							\

		}							\

		schedule();						\

	}								\

	finish_wait(&wq, &__wait);					\

	finish_wait(&wq, &__wait);					\

} while (0)

} while (0)
@@ -302,13 +301,12 @@ do { \ 
		prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);	\

		prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE);	\

		if (condition)						\

		if (condition)						\

			break;						\

			break;						\

		if (!signal_pending(current)) {				\

		if (signal_pending(current)) {				\

			ret = schedule_timeout(ret);			\

			ret = -ERESTARTSYS;				\

			if (!ret)					\

			break;						\

			break;						\

			continue;					\

		}							\

		}							\

		ret = -ERESTARTSYS;					\

		ret = schedule_timeout(ret);				\

		if (!ret)						\

			break;						\

			break;						\

	}								\

	}								\

	if (!ret && (condition))					\

	if (!ret && (condition))					\
@@ -439,15 +437,14 @@ do { \ 
			finish_wait(&wq, &__wait);			\

			finish_wait(&wq, &__wait);			\

			break;						\

			break;						\

		}							\

		}							\

		if (!signal_pending(current)) {				\

		if (signal_pending(current)) {				\

			schedule();					\

			continue;					\

		}							\

			ret = -ERESTARTSYS;				\

			ret = -ERESTARTSYS;				\

			abort_exclusive_wait(&wq, &__wait, 		\

			abort_exclusive_wait(&wq, &__wait, 		\

				TASK_INTERRUPTIBLE, NULL);		\

				TASK_INTERRUPTIBLE, NULL);		\

			break;						\

			break;						\

		}							\

		}							\

		schedule();						\

	}								\

} while (0)

} while (0)





#define wait_event_interruptible_exclusive(wq, condition)		\

#define wait_event_interruptible_exclusive(wq, condition)		\