From 51d9c809258c0df32e884f1864d4102fd48b669c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 12 Dec 2011 23:07:05 -0500 Subject: [PATCH] --- yaml --- r: 280153 b: refs/heads/master c: 79e801a906db46cb8efad66c400b01df874b3f12 h: refs/heads/master i: 280151: 0ea802107b29adfb968e2f494ac4796459564af8 v: v3 --- [refs] | 2 +- trunk/fs/namespace.c | 3 +-- trunk/include/linux/mount.h | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 29d54439d516..49f00b1ede8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5166169f9b920cae3c503910cb66a3ac5dd846d +refs/heads/master: 79e801a906db46cb8efad66c400b01df874b3f12 diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index ed21ac4f7c69..7a8f949cec1b 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -1929,7 +1929,7 @@ static struct vfsmount *fs_set_subtype(struct vfsmount *mnt, const char *fstype) return ERR_PTR(err); } -struct vfsmount * +static struct vfsmount * do_kern_mount(const char *fstype, int flags, const char *name, void *data) { struct file_system_type *type = get_fs_type(fstype); @@ -1943,7 +1943,6 @@ do_kern_mount(const char *fstype, int flags, const char *name, void *data) put_filesystem(type); return mnt; } -EXPORT_SYMBOL_GPL(do_kern_mount); /* * add a mount into a namespace's mount tree diff --git a/trunk/include/linux/mount.h b/trunk/include/linux/mount.h index 33fe53d78110..65c1bb013836 100644 --- a/trunk/include/linux/mount.h +++ b/trunk/include/linux/mount.h @@ -100,9 +100,6 @@ extern void mnt_pin(struct vfsmount *mnt); extern void mnt_unpin(struct vfsmount *mnt); extern int __mnt_is_readonly(struct vfsmount *mnt); -extern struct vfsmount *do_kern_mount(const char *fstype, int flags, - const char *name, void *data); - struct file_system_type; extern struct vfsmount *vfs_kern_mount(struct file_system_type *type, int flags, const char *name,