aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/internal.h
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2006-06-26 03:25:56 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 12:58:26 -0400
commit13b41b09491e5d75e8027dca1ee78f5e073bc4c0 (patch)
tree3f08183a4f59075fc3015165183b8ef17cb562a6 /fs/proc/internal.h
parent99f895518368252ba862cc15ce4eb98ebbe1bec6 (diff)
[PATCH] proc: Use struct pid not struct task_ref
Incrementally update my proc-dont-lock-task_structs-indefinitely patches so that they work with struct pid instead of struct task_ref. Mostly this is a straight 1-1 substitution. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/proc/internal.h')
-rw-r--r--fs/proc/internal.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 37f1648adc23..146a434ba944 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -10,7 +10,6 @@
10 */ 10 */
11 11
12#include <linux/proc_fs.h> 12#include <linux/proc_fs.h>
13#include <linux/task_ref.h>
14 13
15struct vmalloc_info { 14struct vmalloc_info {
16 unsigned long used; 15 unsigned long used;
@@ -51,14 +50,14 @@ void free_proc_entry(struct proc_dir_entry *de);
51 50
52int proc_init_inodecache(void); 51int proc_init_inodecache(void);
53 52
54static inline struct task_ref *proc_tref(struct inode *inode) 53static inline struct pid *proc_pid(struct inode *inode)
55{ 54{
56 return PROC_I(inode)->tref; 55 return PROC_I(inode)->pid;
57} 56}
58 57
59static inline struct task_struct *get_proc_task(struct inode *inode) 58static inline struct task_struct *get_proc_task(struct inode *inode)
60{ 59{
61 return get_tref_task(proc_tref(inode)); 60 return get_pid_task(proc_pid(inode), PIDTYPE_PID);
62} 61}
63 62
64static inline int proc_fd(struct inode *inode) 63static inline int proc_fd(struct inode *inode)