[PATCH] namespace: rename _mntput to mntput_no_expire

This patch renames _mntput() to something a little more descriptive:
mntput_no_expire().

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/namei.c b/fs/namei.c
index fa8df81ce8cadd841e7f73aff5a40aa59dfcf73b..1d93cb4f7c5fdef37ff0ce60daeb6edbad8d12aa 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -314,7 +314,7 @@ void path_release(struct nameidata *nd)
 void path_release_on_umount(struct nameidata *nd)
 {
        dput(nd->dentry);
-       _mntput(nd->mnt);
+       mntput_no_expire(nd->mnt);
 }
 
 /*

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 196d2d6de4a36c4a395ca7d82951e6772dcd2937..74b4727a4e3023aef8b411118a2e705e26321b75 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -47,7 +47,7 @@ static inline struct vfsmount *mntget(struct vfsmount *mnt)
 
 extern void __mntput(struct vfsmount *mnt);
 
-static inline void _mntput(struct vfsmount *mnt)
+static inline void mntput_no_expire(struct vfsmount *mnt)
 {
        if (mnt) {
                if (atomic_dec_and_test(&mnt->mnt_count))
@@ -59,7 +59,7 @@ static inline void mntput(struct vfsmount *mnt)
 {
        if (mnt) {
                mnt->mnt_expiry_mark = 0;
-               _mntput(mnt);
+               mntput_no_expire(mnt);
        }
 }