Messages in this thread Patch in this message | | | From | David Howells <> | Subject | [PATCH 03/14] NFS: Abstract out namespace initialisation [try #10] | Date | Fri, 19 May 2006 16:46:50 +0100 |
| |
The attached patch abstracts out the namespace initialisation so that temporary namespaces can be set up elsewhere.
The following changes were made in [try #8]:
(*) init_namespace() has been made out-of-line.
Signed-Off-By: David Howells <dhowells@redhat.com> ---
fs/namespace.c | 28 +++++++++++++++++++++------- include/linux/namespace.h | 1 + 2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/fs/namespace.c b/fs/namespace.c index 84a3bec..6d2e8fb 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1790,6 +1790,26 @@ out3: goto out2; } +/* + * initialise a namespace, rooting it at the given specified mountpoint if one + * is given + */ +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; + } +} + +EXPORT_SYMBOL_GPL(init_namespace); + static void __init init_mount_tree(void) { struct vfsmount *mnt; @@ -1802,13 +1822,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 --git a/include/linux/namespace.h b/include/linux/namespace.h index 3abc8e3..c371a30 100644 --- a/include/linux/namespace.h +++ b/include/linux/namespace.h @@ -16,6 +16,7 @@ struct namespace { extern int copy_namespace(int, struct task_struct *); extern void __put_namespace(struct namespace *namespace); extern struct namespace *dup_namespace(struct task_struct *, struct fs_struct *); +extern void init_namespace(struct namespace *, struct vfsmount *); static inline void put_namespace(struct namespace *namespace) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |