---

yaml --- r: 346995 b: refs/heads/master c: f6af75d h: refs/heads/master i: 346993: f9bbff7 346991: b461aef v: v3
git-mirror · Dec 18, 2012 · 4149559 · 4149559
1 parent cb8cc62
commit 4149559
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88d67ee3ec52d19e52ae58ef4303464720215d3a
+refs/heads/master: f6af75dac3978d0b4d83939cb5d244b2a844820e
diff --git 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);