leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VFS: Make delayed_free() call free_vfsmnt()

Browse Source 
Make delayed_free() call free_vfsmnt() so that we don't have two functions
doing the same job.  This requires the calls to mnt_free_id() in free_vfsmnt()
to be moved into the callers of that function.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
David Howells 2014-01-24 12:17:54 +00:00 committed by Al Viro
parent 3ef120a459
commit 8ffcb32e05
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/namespace.c
View File

@ -568,13 +568,17 @@ int sb_prepare_remount_readonly(struct super_block *sb)
static void free_vfsmnt(struct mount *mnt) static void free_vfsmnt(struct mount *mnt)
{ {
kfree(mnt->mnt_devname); kfree(mnt->mnt_devname);
mnt_free_id(mnt);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
free_percpu(mnt->mnt_pcp); free_percpu(mnt->mnt_pcp);
#endif #endif
kmem_cache_free(mnt_cache, mnt); kmem_cache_free(mnt_cache, mnt);
} }
static void delayed_free_vfsmnt(struct rcu_head *head)
{
free_vfsmnt(container_of(head, struct mount, mnt_rcu));
}
/* call under rcu_read_lock */ /* call under rcu_read_lock */
bool legitimize_mnt(struct vfsmount *bastard, unsigned seq) bool legitimize_mnt(struct vfsmount *bastard, unsigned seq)
{ {
@ -846,6 +850,7 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void
root = mount_fs(type, flags, name, data); root = mount_fs(type, flags, name, data);
if (IS_ERR(root)) { if (IS_ERR(root)) {
mnt_free_id(mnt);
free_vfsmnt(mnt); free_vfsmnt(mnt);
return ERR_CAST(root); return ERR_CAST(root);
} }
@ -926,20 +931,11 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,
return mnt; return mnt;
out_free: out_free:
mnt_free_id(mnt);
free_vfsmnt(mnt); free_vfsmnt(mnt);
return ERR_PTR(err); return ERR_PTR(err);
} }
static void delayed_free(struct rcu_head *head)
{
struct mount *mnt = container_of(head, struct mount, mnt_rcu);
kfree(mnt->mnt_devname);
#ifdef CONFIG_SMP
free_percpu(mnt->mnt_pcp);
#endif
kmem_cache_free(mnt_cache, mnt);
}
static void mntput_no_expire(struct mount *mnt) static void mntput_no_expire(struct mount *mnt)
{ {
put_again: put_again:
@ -989,7 +985,7 @@ put_again:
dput(mnt->mnt.mnt_root); dput(mnt->mnt.mnt_root);
deactivate_super(mnt->mnt.mnt_sb); deactivate_super(mnt->mnt.mnt_sb);
mnt_free_id(mnt); mnt_free_id(mnt);
call_rcu(&mnt->mnt_rcu, delayed_free); call_rcu(&mnt->mnt_rcu, delayed_free_vfsmnt);
} }
void mntput(struct vfsmount *mnt) void mntput(struct vfsmount *mnt)