From: Jan Blunck This introduces the symmetric function to path_put() for getting a reference to the dentry and vfsmount of a struct path in the right order. Signed-off-by: Jan Blunck Signed-off-by: Andreas Gruenbacher Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton --- fs/namei.c | 17 +++++++++++++++-- include/linux/namei.h | 6 ------ include/linux/path.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff -puN fs/namei.c~introduce-path_get fs/namei.c --- a/fs/namei.c~introduce-path_get +++ a/fs/namei.c @@ -363,6 +363,19 @@ int deny_write_access(struct file * file } /** + * path_get - get a reference to a path + * @path: path to get the reference to + * + * Given a path increment the reference count to the dentry and the vfsmount. + */ +void path_get(struct path *path) +{ + mntget(path->mnt); + dget(path->dentry); +} +EXPORT_SYMBOL(path_get); + +/** * path_put - put a reference to a path * @path: path to put the reference to * @@ -1161,8 +1174,8 @@ static int fastcall do_path_lookup(int d if (retval) goto fput_fail; - nd->path.mnt = mntget(file->f_path.mnt); - nd->path.dentry = dget(dentry); + nd->path = file->f_path; + path_get(&file->f_path); fput_light(file, fput_needed); } diff -puN include/linux/namei.h~introduce-path_get include/linux/namei.h --- a/include/linux/namei.h~introduce-path_get +++ a/include/linux/namei.h @@ -94,10 +94,4 @@ static inline char *nd_get_link(struct n return nd->saved_names[nd->depth]; } -static inline void pathget(struct path *path) -{ - mntget(path->mnt); - dget(path->dentry); -} - #endif /* _LINUX_NAMEI_H */ diff -puN include/linux/path.h~introduce-path_get include/linux/path.h --- a/include/linux/path.h~introduce-path_get +++ a/include/linux/path.h @@ -9,6 +9,7 @@ struct path { struct dentry *dentry; }; +extern void path_get(struct path *); extern void path_put(struct path *); #endif /* _LINUX_PATH_H */ _