diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-12 03:52:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:31 -0500 |
commit | cdc623300841bc8f1625c320d5a6cbc52c43c60d (patch) | |
tree | b9c8f56847eb78aa4d92e3948579be9d2f647b63 /drivers | |
parent | 939b00df0306bc4b5cd25c3c3c78e89b91e72fc8 (diff) |
[PATCH] tty: make __proc_set_tty static
The aim of this patch set is to start wrapping up the struct pid conversions.
As such this patchset culminates with the removal of kill_pg, kill_pg_info,
__kill_pg_info, do_each_task_pid, and while_each_task_pid.
kill_proc, daemonize, and kernel_thread are still in my sights but there is
still work to get to them.
The first three are basic cleanups around disassociate_ctty, while working on
converting it I found several issues. tty_old_pgrp can be a tricky concept to
wrap your head around.
1 tty: Make __proc_set_tty static.
2 tty: Clarify disassociate_ctty
3 tty: Fix the locking for signal->session in disassociate_ctty
These just stop using the old helper functions.
4 signal: Use kill_pgrp not kill_pg in the sunos compatibility code.
5 signal: Rewrite kill_something_info so it uses newer helpers.
Then the grind to convert the tty layer and all of it's helper functions to
struct pid.
6 pid: Make session_of_pgrp use struct pid instead of pid_t.
7 pid: Use struct pid for talking about process groups in exit.c
8 pid: Replace is_orphaned_pgrp with is_current_pgrp_orphaned
9 tty: Update the tty layer to work with struct pid.
A final helper function update.
10 pid: Replace do/while_each_task_pid with do/while_each_pid_task
And the removal of the functions that are now unused.
11 pid: Remove now unused do_each_task_pid and while_each_task_pid
12 pid: Remove the now unused kill_pg kill_pg_info and __kill_pg_info
All of these should be fairly simple and to the point.
This patch:
Currently all users of __proc_set_tty are in tty_io.c so make the function
static.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/tty_io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 558ca927e32b..b9fce77c8f03 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -155,6 +155,7 @@ int tty_ioctl(struct inode * inode, struct file * file, | |||
155 | unsigned int cmd, unsigned long arg); | 155 | unsigned int cmd, unsigned long arg); |
156 | static int tty_fasync(int fd, struct file * filp, int on); | 156 | static int tty_fasync(int fd, struct file * filp, int on); |
157 | static void release_tty(struct tty_struct *tty, int idx); | 157 | static void release_tty(struct tty_struct *tty, int idx); |
158 | static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); | ||
158 | 159 | ||
159 | /** | 160 | /** |
160 | * alloc_tty_struct - allocate a tty object | 161 | * alloc_tty_struct - allocate a tty object |
@@ -3791,7 +3792,7 @@ void proc_clear_tty(struct task_struct *p) | |||
3791 | } | 3792 | } |
3792 | EXPORT_SYMBOL(proc_clear_tty); | 3793 | EXPORT_SYMBOL(proc_clear_tty); |
3793 | 3794 | ||
3794 | void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty) | 3795 | static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty) |
3795 | { | 3796 | { |
3796 | if (tty) { | 3797 | if (tty) { |
3797 | tty->session = process_session(tsk); | 3798 | tty->session = process_session(tsk); |