From 15fdc4e69c759bcf01e056d34489ee46cc47562c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Aug 2011 13:02:37 -0700
Subject: [PATCH] --- yaml --- r: 263689 b: refs/heads/master c:
 795858dbd253462a67e14272edeaae73c6074b17 h: refs/heads/master i:   263687:
 1f6573dcd86654d5058cb54d0de011c704dde340 v: v3

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

diff --git a/[refs] b/[refs]
index f8930c81cef8..fb4a7bac11b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5185352c163a72cf969b2fbbfb89801b398896fd
+refs/heads/master: 795858dbd253462a67e14272edeaae73c6074b17
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index fee028b5332e..86c59e16ba74 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/fs/ceph/mds_client.c
@@ -1595,7 +1595,7 @@ static int set_request_path_attr(struct inode *rinode, struct dentry *rdentry,
 		r = build_dentry_path(rdentry, ppath, pathlen, ino, freepath);
 		dout(" dentry %p %llx/%.*s\n", rdentry, *ino, *pathlen,
 		     *ppath);
-	} else if (rpath) {
+	} else if (rpath || rino) {
 		*ino = rino;
 		*ppath = rpath;
 		*pathlen = strlen(rpath);