From f3af0378ed59146320700e676476bdb45625373a Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Sun, 21 Oct 2007 16:42:07 -0700
Subject: [PATCH] --- yaml --- r: 71983 b: refs/heads/master c:
 74af0baad4fd44cc4412cc210d6d9b6fdf7be8da h: refs/heads/master i:   71981:
 df3c8175ec5a43352b97f3b26758a9fd3b0f7130   71979:
 dc4ed395fdc6c1419c6726a888cf45b421c2d00f   71975:
 21be27554f5d77ee386948881d12c713f73910bb   71967:
 8266552af96d29de043b3fcddd5ce80f1be719e2 v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext3/super.c | 35 ++++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index b453d389388f..fdf2971bb7d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e4c68e30352bc0018999c3e631e4363ce428424
+refs/heads/master: 74af0baad4fd44cc4412cc210d6d9b6fdf7be8da
diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c
index 81868c0bc40e..6a66f3d02b75 100644
--- a/trunk/fs/ext3/super.c
+++ b/trunk/fs/ext3/super.c
@@ -631,13 +631,10 @@ static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs)
 }
 
 
-static struct dentry *ext3_get_dentry(struct super_block *sb, void *vobjp)
+static struct inode *ext3_nfs_get_inode(struct super_block *sb,
+		u64 ino, u32 generation)
 {
-	__u32 *objp = vobjp;
-	unsigned long ino = objp[0];
-	__u32 generation = objp[1];
 	struct inode *inode;
-	struct dentry *result;
 
 	if (ino < EXT3_FIRST_INO(sb) && ino != EXT3_ROOT_INO)
 		return ERR_PTR(-ESTALE);
@@ -660,15 +657,22 @@ static struct dentry *ext3_get_dentry(struct super_block *sb, void *vobjp)
 		iput(inode);
 		return ERR_PTR(-ESTALE);
 	}
-	/* now to find a dentry.
-	 * If possible, get a well-connected one
-	 */
-	result = d_alloc_anon(inode);
-	if (!result) {
-		iput(inode);
-		return ERR_PTR(-ENOMEM);
-	}
-	return result;
+
+	return inode;
+}
+
+static struct dentry *ext3_fh_to_dentry(struct super_block *sb, struct fid *fid,
+		int fh_len, int fh_type)
+{
+	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
+				    ext3_nfs_get_inode);
+}
+
+static struct dentry *ext3_fh_to_parent(struct super_block *sb, struct fid *fid,
+		int fh_len, int fh_type)
+{
+	return generic_fh_to_parent(sb, fid, fh_len, fh_type,
+				    ext3_nfs_get_inode);
 }
 
 #ifdef CONFIG_QUOTA
@@ -738,8 +742,9 @@ static const struct super_operations ext3_sops = {
 };
 
 static struct export_operations ext3_export_ops = {
+	.fh_to_dentry = ext3_fh_to_dentry,
+	.fh_to_parent = ext3_fh_to_parent,
 	.get_parent = ext3_get_parent,
-	.get_dentry = ext3_get_dentry,
 };
 
 enum {