From 4149559798bd58462ecc34f5005f4bda89642642 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 18 Dec 2012 14:21:23 -0800 Subject: [PATCH] --- yaml --- r: 346995 b: refs/heads/master c: f6af75dac3978d0b4d83939cb5d244b2a844820e h: refs/heads/master i: 346993: f9bbff7e41f1953b84dbdf8a9bd03b6c0c870a30 346991: b461aef4ec3565c7a63fa0e98decd2bce07ee901 v: v3 --- [refs] | 2 +- trunk/fs/ceph/export.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 49e0a1782521..0ccabb7f16d8 100644 --- 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 index 9349bb37a2fe..ca3ab3f9ca70 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);