diff options
-rw-r--r-- | fs/namespace.c | 6 | ||||
-rw-r--r-- | include/linux/fs.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 1a1ed2528f47..bb9b7db1c66c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -3390,10 +3390,10 @@ void put_mnt_ns(struct mnt_namespace *ns) | |||
3390 | free_mnt_ns(ns); | 3390 | free_mnt_ns(ns); |
3391 | } | 3391 | } |
3392 | 3392 | ||
3393 | struct vfsmount *kern_mount_data(struct file_system_type *type, void *data) | 3393 | struct vfsmount *kern_mount(struct file_system_type *type) |
3394 | { | 3394 | { |
3395 | struct vfsmount *mnt; | 3395 | struct vfsmount *mnt; |
3396 | mnt = vfs_kern_mount(type, SB_KERNMOUNT, type->name, data); | 3396 | mnt = vfs_kern_mount(type, SB_KERNMOUNT, type->name, NULL); |
3397 | if (!IS_ERR(mnt)) { | 3397 | if (!IS_ERR(mnt)) { |
3398 | /* | 3398 | /* |
3399 | * it is a longterm mount, don't release mnt until | 3399 | * it is a longterm mount, don't release mnt until |
@@ -3403,7 +3403,7 @@ struct vfsmount *kern_mount_data(struct file_system_type *type, void *data) | |||
3403 | } | 3403 | } |
3404 | return mnt; | 3404 | return mnt; |
3405 | } | 3405 | } |
3406 | EXPORT_SYMBOL_GPL(kern_mount_data); | 3406 | EXPORT_SYMBOL_GPL(kern_mount); |
3407 | 3407 | ||
3408 | void kern_unmount(struct vfsmount *mnt) | 3408 | void kern_unmount(struct vfsmount *mnt) |
3409 | { | 3409 | { |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 9d05c128ccf6..3e85cb8e8c20 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -2280,8 +2280,7 @@ mount_pseudo(struct file_system_type *fs_type, char *name, | |||
2280 | 2280 | ||
2281 | extern int register_filesystem(struct file_system_type *); | 2281 | extern int register_filesystem(struct file_system_type *); |
2282 | extern int unregister_filesystem(struct file_system_type *); | 2282 | extern int unregister_filesystem(struct file_system_type *); |
2283 | extern struct vfsmount *kern_mount_data(struct file_system_type *, void *data); | 2283 | extern struct vfsmount *kern_mount(struct file_system_type *); |
2284 | #define kern_mount(type) kern_mount_data(type, NULL) | ||
2285 | extern void kern_unmount(struct vfsmount *mnt); | 2284 | extern void kern_unmount(struct vfsmount *mnt); |
2286 | extern int may_umount_tree(struct vfsmount *); | 2285 | extern int may_umount_tree(struct vfsmount *); |
2287 | extern int may_umount(struct vfsmount *); | 2286 | extern int may_umount(struct vfsmount *); |