diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2006-01-08 04:03:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:57 -0500 |
commit | 850d6fbe70c62a9792eac3e8ef34f2f09f209895 (patch) | |
tree | e02e6bbfd670c7250134c894356d9599a35820bd | |
parent | 86174cdcb44c095ffd2e3ca69caa56244cf701d5 (diff) |
[PATCH] sigio: cleanup, don't take tasklist twice
The only user of send_sigio_to_task() already holds tasklist_lock, so it is
better not to send the signal via send_group_sig_info() (which takes
tasklist recursively) but use group_send_sig_info().
The same change in send_sigurg()->send_sigurg_to_task().
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/fcntl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 863b46e0d78a..9903bde475f2 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -457,11 +457,11 @@ static void send_sigio_to_task(struct task_struct *p, | |||
457 | else | 457 | else |
458 | si.si_band = band_table[reason - POLL_IN]; | 458 | si.si_band = band_table[reason - POLL_IN]; |
459 | si.si_fd = fd; | 459 | si.si_fd = fd; |
460 | if (!send_group_sig_info(fown->signum, &si, p)) | 460 | if (!group_send_sig_info(fown->signum, &si, p)) |
461 | break; | 461 | break; |
462 | /* fall-through: fall back on the old plain SIGIO signal */ | 462 | /* fall-through: fall back on the old plain SIGIO signal */ |
463 | case 0: | 463 | case 0: |
464 | send_group_sig_info(SIGIO, SEND_SIG_PRIV, p); | 464 | group_send_sig_info(SIGIO, SEND_SIG_PRIV, p); |
465 | } | 465 | } |
466 | } | 466 | } |
467 | 467 | ||
@@ -495,7 +495,7 @@ static void send_sigurg_to_task(struct task_struct *p, | |||
495 | struct fown_struct *fown) | 495 | struct fown_struct *fown) |
496 | { | 496 | { |
497 | if (sigio_perm(p, fown, SIGURG)) | 497 | if (sigio_perm(p, fown, SIGURG)) |
498 | send_group_sig_info(SIGURG, SEND_SIG_PRIV, p); | 498 | group_send_sig_info(SIGURG, SEND_SIG_PRIV, p); |
499 | } | 499 | } |
500 | 500 | ||
501 | int send_sigurg(struct fown_struct *fown) | 501 | int send_sigurg(struct fown_struct *fown) |