From cb6d78c5e8ca881adb378e0f9b03f228e1903685 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 23 Jan 2010 20:10:29 -0500
Subject: [PATCH] --- yaml --- r: 185703 b: refs/heads/master c:
 3899167dbd6832a3d8d7171b425257ad46b6c40c h: refs/heads/master i:   185701:
 57ed4ba1167c10f419fb81497abac362e0a24d3c   185699:
 13c28961534b936797113d974c19ad69c662f5a8   185695:
 a5098c36c366379d04e0f6dca92c4a907fa5865d v: v3

---
 [refs]               | 2 +-
 trunk/fs/ext4/file.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8b5941fd2c3e..3a20e8613a5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f598f9f1252b33410ffc52f51e117645ac5116c4
+refs/heads/master: 3899167dbd6832a3d8d7171b425257ad46b6c40c
diff --git a/trunk/fs/ext4/file.c b/trunk/fs/ext4/file.c
index 9630583cef28..56eee3d796c2 100644
--- a/trunk/fs/ext4/file.c
+++ b/trunk/fs/ext4/file.c
@@ -116,11 +116,9 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
 		 * devices or filesystem images.
 		 */
 		memset(buf, 0, sizeof(buf));
-		path.mnt = mnt->mnt_parent;
-		path.dentry = mnt->mnt_mountpoint;
-		path_get(&path);
+		path.mnt = mnt;
+		path.dentry = mnt->mnt_root;
 		cp = d_path(&path, buf, sizeof(buf));
-		path_put(&path);
 		if (!IS_ERR(cp)) {
 			memcpy(sbi->s_es->s_last_mounted, cp,
 			       sizeof(sbi->s_es->s_last_mounted));