From 7c3fc338967253fe61e636f5f9262ae26655995f Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <tipecaml@gmail.com>
Date: Tue, 20 Nov 2012 10:23:07 -0600
Subject: [PATCH] --- yaml --- r: 347601 b: refs/heads/master c:
 cfc84c9f73ab8a6933bd4f36efac1196cddad581 h: refs/heads/master i:   347599:
 1297d16be6963caa438f68a318ab3ad3be37a4ac v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ceph/export.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b92920bd15a9..c2a112f5a5ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22cddde104d715600a4c218bf9224923208afe90
+refs/heads/master: cfc84c9f73ab8a6933bd4f36efac1196cddad581
diff --git a/trunk/fs/ceph/export.c b/trunk/fs/ceph/export.c
index 862887004d20..f350be34601f 100644
--- a/trunk/fs/ceph/export.c
+++ b/trunk/fs/ceph/export.c
@@ -56,13 +56,15 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,
 	struct ceph_nfs_confh *cfh = (void *)rawfh;
 	int connected_handle_length = sizeof(*cfh)/4;
 	int handle_length = sizeof(*fh)/4;
-	struct dentry *dentry = d_find_alias(inode);
+	struct dentry *dentry;
 	struct dentry *parent;
 
 	/* don't re-export snaps */
 	if (ceph_snap(inode) != CEPH_NOSNAP)
 		return -EINVAL;
 
+	dentry = d_find_alias(inode);
+
 	/* if we found an alias, generate a connectable fh */
 	if (*max_len >= connected_handle_length && dentry) {
 		dout("encode_fh %p connectable\n", dentry);