diff options
| author | Jan Blunck <jblunck@suse.de> | 2008-02-15 06:34:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 08:13:32 +0300 |
| commit | 429731b1553bacf9a331c260c317a28aaa878edb (patch) | |
| tree | d9feaea03f5abe2eb3ac6a40cbd4e4e3b4638e6a /fs/namespace.c | |
| parent | db74ece990ea59a9ec9f00f8881026059ef5caf5 (diff) | |
| download | linux-429731b1553bacf9a331c260c317a28aaa878edb.tar.xz | |
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>
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |