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

Commit f6c7a1f3 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[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: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 20cdc894

fs/proc/root.c

+12 −0
Original line number Diff line number Diff line
@@ -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);

}