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>

2 files changed, 3 insertions, 11 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 52703986323a..3ed4d7576d6d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -368,16 +368,6 @@ void path_release(struct nameidata *nd)
         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
  * @nd: pointer to nameidata
diff --git a/fs/namespace.c b/fs/namespace.c
index 63ced21c12dc..7937d30a6732 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -690,7 +690,9 @@ asmlinkage long sys_umount(char __user * name, int flags)
 
         retval = do_umount(nd.mnt, flags);
 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:
         return retval;
 }