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

Commit 429731b1 authored Feb 14, 2008 by Jan Blunck Committed by Linus Torvalds Feb 14, 2008

Remove path_release_on_umount()



path_release_on_umount() should only be called from sys_umount(). I merged the
function into sys_umount() instead of having in in namei.c.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent db74ece9

fs/namei.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -368,16 +368,6 @@ void path_release(struct nameidata *nd)
	mntput(nd->mnt);		mntput(nd->mnt);
	}		}

	/*
	* umount() mustn't call path_release()/mntput() as that would clear
	* mnt_expiry_mark
	*/
	void path_release_on_umount(struct nameidata *nd)
	{
	dput(nd->dentry);
	mntput_no_expire(nd->mnt);
	}

	/**		/**
	* release_open_intent - free up open intent resources		* release_open_intent - free up open intent resources
	* @nd: pointer to nameidata		* @nd: pointer to nameidata

fs/namespace.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -690,7 +690,9 @@ asmlinkage long sys_umount(char __user * name, int flags)

	retval = do_umount(nd.mnt, flags);		retval = do_umount(nd.mnt, flags);
	dput_and_out:		dput_and_out:
	path_release_on_umount(&nd);		/* we mustn't call path_put() as that would clear mnt_expiry_mark */
			dput(nd.dentry);
			mntput_no_expire(nd.mnt);
	out:		out:
	return retval;		return retval;
	}		}

include/linux/namei.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,6 @@ extern int path_lookup(const char , unsigned, struct nameidata );
	extern int vfs_path_lookup(struct dentry , struct vfsmount ,		extern int vfs_path_lookup(struct dentry , struct vfsmount ,
	const char , unsigned int, struct nameidata );		const char , unsigned int, struct nameidata );
	extern void path_release(struct nameidata *);		extern void path_release(struct nameidata *);
	extern void path_release_on_umount(struct nameidata *);

	extern int __user_path_lookup_open(const char __user , unsigned lookup_flags, struct nameidata nd, int open_flags);		extern int __user_path_lookup_open(const char __user , unsigned lookup_flags, struct nameidata nd, int open_flags);
	extern int path_lookup_open(int dfd, const char name, unsigned lookup_flags, struct nameidata , int open_flags);		extern int path_lookup_open(int dfd, const char name, unsigned lookup_flags, struct nameidata , int open_flags);