From: David Howells Abstract out the namespace initialisation so that temporary namespaces can be set up elsewhere. Signed-off-by: David Howells Cc: Trond Myklebust Signed-off-by: Andrew Morton --- fs/namespace.c | 8 +------- include/linux/namespace.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff -puN fs/namespace.c~nfs-abstract-out-namespace-initialisation-6 fs/namespace.c --- 25/fs/namespace.c~nfs-abstract-out-namespace-initialisation-6 Tue Mar 7 14:53:06 2006 +++ 25-akpm/fs/namespace.c Tue Mar 7 14:53:06 2006 @@ -1726,13 +1726,7 @@ static void __init init_mount_tree(void) namespace = kmalloc(sizeof(*namespace), GFP_KERNEL); if (!namespace) panic("Can't allocate initial namespace"); - atomic_set(&namespace->count, 1); - INIT_LIST_HEAD(&namespace->list); - init_waitqueue_head(&namespace->poll); - namespace->event = 0; - list_add(&mnt->mnt_list, &namespace->list); - namespace->root = mnt; - mnt->mnt_namespace = namespace; + init_namespace(namespace, mnt); init_task.namespace = namespace; read_lock(&tasklist_lock); diff -puN include/linux/namespace.h~nfs-abstract-out-namespace-initialisation-6 include/linux/namespace.h --- 25/include/linux/namespace.h~nfs-abstract-out-namespace-initialisation-6 Tue Mar 7 14:53:06 2006 +++ 25-akpm/include/linux/namespace.h Tue Mar 7 14:53:06 2006 @@ -17,6 +17,21 @@ extern int copy_namespace(int, struct ta extern void __put_namespace(struct namespace *namespace); extern struct namespace *dup_namespace(struct task_struct *, struct fs_struct *); +static inline void init_namespace(struct namespace *namespace, + struct vfsmount *mnt) +{ + atomic_set(&namespace->count, 1); + INIT_LIST_HEAD(&namespace->list); + init_waitqueue_head(&namespace->poll); + namespace->event = 0; + namespace->root = mnt; + + if (mnt) { + list_add(&mnt->mnt_list, &namespace->list); + mnt->mnt_namespace = namespace; + } +} + static inline void put_namespace(struct namespace *namespace) { if (atomic_dec_and_lock(&namespace->count, &vfsmount_lock)) _