diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-08-09 10:44:32 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 12:16:44 -0500 |
commit | e9496ff46a20a8592fdc7bdaaf41b45eb808d310 (patch) | |
tree | 6668789814bf4726a82ad282724b72a09e247175 /include/linux | |
parent | b0446be4be44768c7c7e919fadda98e1315fad09 (diff) |
fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mnt_namespace.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h index d74785c2393a..d9ebf1037dfa 100644 --- a/include/linux/mnt_namespace.h +++ b/include/linux/mnt_namespace.h | |||
@@ -23,7 +23,6 @@ struct proc_mounts { | |||
23 | 23 | ||
24 | struct fs_struct; | 24 | struct fs_struct; |
25 | 25 | ||
26 | extern struct mnt_namespace *create_mnt_ns(struct vfsmount *mnt); | ||
27 | extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, | 26 | extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, |
28 | struct fs_struct *); | 27 | struct fs_struct *); |
29 | extern void put_mnt_ns(struct mnt_namespace *ns); | 28 | extern void put_mnt_ns(struct mnt_namespace *ns); |