lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove path_release_on_umount()

Browse Source 
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>
This commit is contained in:
Jan Blunck
2008-02-14 19:34:31 -08:00
committed by Linus Torvalds
parent db74ece990
commit 429731b155
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/namei.c
View File

@ -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

4
fs/namespace.c
View File

@ -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;
} }

1
include/linux/namei.h
View File

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