---

yaml --- r: 4299 b: refs/heads/master c: 751c404 h: refs/heads/master i: 4297: d0140df 4295: b2cc982 v: v3
git-mirror · Jul 8, 2005 · de17c31 · de17c31
1 parent 7f0d8bb
commit de17c31
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);
 	}
 }