Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ffcb32e authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

VFS: Make delayed_free() call free_vfsmnt() 



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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3ef120a4

fs/namespace.c

+8 −12
Original line number Diff line number Diff line
@@ -568,13 +568,17 @@ int sb_prepare_remount_readonly(struct super_block *sb) 
static void free_vfsmnt(struct mount *mnt)

{

	kfree(mnt->mnt_devname);

	mnt_free_id(mnt);

#ifdef CONFIG_SMP

	free_percpu(mnt->mnt_pcp);

#endif

	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 */

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);

	if (IS_ERR(root)) {

		mnt_free_id(mnt);

		free_vfsmnt(mnt);

		return ERR_CAST(root);

	}
@@ -926,20 +931,11 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root, 
	return mnt;



 out_free:

	mnt_free_id(mnt);

	free_vfsmnt(mnt);

	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)

{

put_again:
@@ -989,7 +985,7 @@ put_again: 
	dput(mnt->mnt.mnt_root);

	deactivate_super(mnt->mnt.mnt_sb);

	mnt_free_id(mnt);

	call_rcu(&mnt->mnt_rcu, delayed_free);

	call_rcu(&mnt->mnt_rcu, delayed_free_vfsmnt);

}



void mntput(struct vfsmount *mnt)