diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2006-10-02 02:17:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 07:57:13 -0700 |
commit | f6c7a1f34e92b0b561024ead9fa70623683025e4 (patch) | |
tree | 6906523c635c28ccf7b1d4f726e8ac67cf22d362 /fs | |
parent | 20cdc894c45d2e4ab0c69e95a56b7c5ed36ae0dd (diff) | |
download | linux-3.10-f6c7a1f34e92b0b561024ead9fa70623683025e4.tar.gz linux-3.10-f6c7a1f34e92b0b561024ead9fa70623683025e4.tar.bz2 linux-3.10-f6c7a1f34e92b0b561024ead9fa70623683025e4.zip |
[PATCH] proc: give the root directory a task
Helper functions in base.c like proc_pident_readdir and proc_pident_lookup
assume the directories have an associated task, and cannot currently be used
on the /proc root directory because it does not have such a task.
This small changes allows for base.c to be simplified and later when multiple
pid spaces are introduced it makes getting the needed context information
trivial.
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')
-rw-r--r-- | fs/proc/root.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 8901c65caca..ffe66c38488 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -16,6 +16,7 @@ #include <linux/module.h> #include <linux/bitops.h> #include <linux/smp_lock.h> +#include <linux/mount.h> #include "internal.h" @@ -28,6 +29,17 @@ struct proc_dir_entry *proc_sys_root; static int proc_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { + if (proc_mnt) { + /* Seed the root directory with a pid so it doesn't need + * to be special in base.c. I would do this earlier but + * the only task alive when /proc is mounted the first time + * is the init_task and it doesn't have any pids. + */ + struct proc_inode *ei; + ei = PROC_I(proc_mnt->mnt_sb->s_root->d_inode); + if (!ei->pid) + ei->pid = find_get_pid(1); + } return get_sb_single(fs_type, flags, data, proc_fill_super, mnt); } |