vfs: Remove kern_mount_data()

dhowells · Al Viro · commit d911b4585eb3 · 2019-02-28T03:29:36.000-05:00
The kern_mount_data() isn't used any more so remove it.

Signed-off-by: David Howells &lt;dhowells@redhat.com&gt;
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/namespace.c b/fs/namespace.c
@@ -3390,10 +3390,10 @@ void put_mnt_ns(struct mnt_namespace *ns)
 	free_mnt_ns(ns);
 }
 
-struct vfsmount *kern_mount_data(struct file_system_type *type, void *data)
+struct vfsmount *kern_mount(struct file_system_type *type)
 {
 	struct vfsmount *mnt;
-	mnt = vfs_kern_mount(type, SB_KERNMOUNT, type->name, data);
+	mnt = vfs_kern_mount(type, SB_KERNMOUNT, type->name, NULL);
 	if (!IS_ERR(mnt)) {
 		/*
 		 * 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)
 	}
 	return mnt;
 }
-EXPORT_SYMBOL_GPL(kern_mount_data);
+EXPORT_SYMBOL_GPL(kern_mount);
 
 void kern_unmount(struct vfsmount *mnt)
 {
diff --git a/include/linux/fs.h b/include/linux/fs.h
@@ -2280,8 +2280,7 @@ mount_pseudo(struct file_system_type *fs_type, char *name,
 
 extern int register_filesystem(struct file_system_type *);
 extern int unregister_filesystem(struct file_system_type *);
-extern struct vfsmount *kern_mount_data(struct file_system_type *, void *data);
-#define kern_mount(type) kern_mount_data(type, NULL)
+extern struct vfsmount *kern_mount(struct file_system_type *);
 extern void kern_unmount(struct vfsmount *mnt);
 extern int may_umount_tree(struct vfsmount *);
 extern int may_umount(struct vfsmount *);

Original file line number	Diff line number	Diff line change
`@@ -3390,10 +3390,10 @@ void put_mnt_ns(struct mnt_namespace *ns)`
`3390`	`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`	`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`	`3397`	`if (!IS_ERR(mnt)) {`
`3398`	`3398`	`/*`
`3399`	`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`	`3404`	`return mnt;`
`3405`	`3405`	`}`
`3406`		`-EXPORT_SYMBOL_GPL(kern_mount_data);`
	`3406`	`+EXPORT_SYMBOL_GPL(kern_mount);`
`3407`	`3407`
`3408`	`3408`	`void kern_unmount(struct vfsmount *mnt)`
`3409`	`3409`	`{`