From de17c317c086084dd5f9b00c1c4497d7e294ae48 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Thu, 7 Jul 2005 17:57:30 -0700
Subject: [PATCH] --- yaml --- r: 4299 b: refs/heads/master c:
 751c404b8f63e8199d5f2f8f2bcfd69b41d11caa h: refs/heads/master i:   4297:
 d0140dff503f127c075b436bfb73449de32b7861   4295:
 b2cc9821178afa9f0aa5cf86f3ebb7ea50b9e2eb v: v3

---
 [refs]                      | 2 +-
 trunk/fs/namei.c            | 2 +-
 trunk/include/linux/mount.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4005a90e1e48..38b84edd2620 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55e700b924f9e0ba24e3a071d1097d050b05abe6
+refs/heads/master: 751c404b8f63e8199d5f2f8f2bcfd69b41d11caa
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index fa8df81ce8ca..1d93cb4f7c5f 100644
--- a/trunk/fs/namei.c
+++ b/trunk/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/trunk/include/linux/mount.h b/trunk/include/linux/mount.h
index 196d2d6de4a3..74b4727a4e30 100644
--- a/trunk/include/linux/mount.h
+++ b/trunk/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);
 	}
 }