[38/43] vfs: Remove kern_mount_data()

Message ID	155059402497.12449.9115734348268644271.stgit@warthog.procyon.org.uk (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-security-module-owner@kernel.org> Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 38/43] vfs: Remove kern_mount_data() From: David Howells <dhowells@redhat.com> To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, dhowells@redhat.com, torvalds@linux-foundation.org, ebiederm@xmission.com, linux-security-module@vger.kernel.org Date: Tue, 19 Feb 2019 16:33:45 +0000 Message-ID: <155059402497.12449.9115734348268644271.stgit@warthog.procyon.org.uk> In-Reply-To: <155059366914.12449.4669870128936536848.stgit@warthog.procyon.org.uk> References: <155059366914.12449.4669870128936536848.stgit@warthog.procyon.org.uk> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk
Series	VFS: Introduce filesystem context \| expand [00/43] VFS: Introduce filesystem context [01/43] fix cgroup_do_mount() handling of failure exits [02/43] cgroup: saner refcounting for cgroup_root [03/43] kill kernfs_pin_sb() [04/43] separate copying and locking mount tree on cross-userns copies [05/43] saner handling of temporary namespaces [06/43] vfs: Introduce fs_context, switch vfs_kern_mount() to it. [07/43] new helpers: vfs_create_mount(), fc_mount() [08/43] teach vfs_get_tree() to handle subtype, switch do_new_mount() to it [09/43] new helper: do_new_mount_fc() [10/43] vfs_get_tree(): evict the call of security_sb_kern_mount() [11/43] convert do_remount_sb() to fs_context [12/43] fs_context flavour for submounts [13/43] introduce fs_context methods [14/43] vfs: Introduce logging functions [15/43] vfs: Add configuration parser helpers [16/43] vfs: Add LSM hooks for the new mount API [17/43] selinux: Implement the new mount API LSM hooks [18/43] smack: Implement filesystem context security hooks [19/43] vfs: Put security flags into the fs_context struct [20/43] vfs: Implement a filesystem superblock creation/configuration context [21/43] convenience helpers: vfs_get_super() and sget_fc() [22/43] introduce cloning of fs_context [23/43] procfs: Move proc_fill_super() to fs/proc/root.c [24/43] proc: Add fs_context support to procfs [25/43] ipc: Convert mqueue fs to fs_context [26/43] cgroup: start switching to fs_context [27/43] cgroup: fold cgroup1_mount() into cgroup1_get_tree() [28/43] cgroup: take options parsing into ->parse_monolithic() [29/43] cgroup1: switch to option-by-option parsing [30/43] cgroup2: switch to option-by-option parsing [31/43] cgroup: stash cgroup_root reference into cgroup_fs_context [32/43] cgroup_do_mount(): massage calling conventions [33/43] cgroup1_get_tree(): separate "get cgroup_root to use" into a separate helper [34/43] cgroup: store a reference to cgroup_ns into cgroup_fs_context [35/43] kernfs, sysfs, cgroup, intel_rdt: Support fs_context [36/43] cpuset: Use fs_context [37/43] hugetlbfs: Convert to fs_context [38/43] vfs: Remove kern_mount_data() [39/43] vfs: Provide documentation for new mount API [40/43] vfs: Implement logging through fs_context [41/43] vfs: Add some logging to the core users of the fs_context log [42/43] afs: Add fs_context support [43/43] afs: Use fs_context to pass parameters over automount

Message ID

155059402497.12449.9115734348268644271.stgit@warthog.procyon.org.uk (mailing list archive)

State

New, archived

Headers

Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley
 Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United
 Kingdom.
 Registered in England and Wales under Company Registration No. 3798903
Subject: [PATCH 38/43] vfs: Remove kern_mount_data()
From: David Howells <dhowells@redhat.com>
To: viro@zeniv.linux.org.uk
Cc: linux-fsdevel@vger.kernel.org, dhowells@redhat.com,
        torvalds@linux-foundation.org, ebiederm@xmission.com,
        linux-security-module@vger.kernel.org
Date: Tue, 19 Feb 2019 16:33:45 +0000
Message-ID: 
 <155059402497.12449.9115734348268644271.stgit@warthog.procyon.org.uk>
In-Reply-To: 
 <155059366914.12449.4669870128936536848.stgit@warthog.procyon.org.uk>
References: 
 <155059366914.12449.4669870128936536848.stgit@warthog.procyon.org.uk>
User-Agent: StGit/unknown-version
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Sender: owner-linux-security-module@vger.kernel.org
Precedence: bulk

Series

VFS: Introduce filesystem context | expand

Commit Message

David Howells Feb. 19, 2019, 4:33 p.m. UTC

The kern_mount_data() isn't used any more so remove it.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

 fs/namespace.c     |    6 +++---
 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)
 	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
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,
 
 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 *);

[38/43] vfs: Remove kern_mount_data()

Commit Message

Patch