summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-08-15 13:02:37 -0700
committerSage Weil <sage@newdream.net>2011-08-15 13:03:56 -0700
commit795858dbd253462a67e14272edeaae73c6074b17 (patch)
treea9fb8a08682e6387d7d6c745633a6b7e2aec2679
parent5185352c163a72cf969b2fbbfb89801b398896fd (diff)
downloadlinux-stable-795858dbd253462a67e14272edeaae73c6074b17.tar.gz
linux-stable-795858dbd253462a67e14272edeaae73c6074b17.tar.bz2
linux-stable-795858dbd253462a67e14272edeaae73c6074b17.zip
ceph: fix encoding of ino only (not relative) paths
A 'path' consists of a starting ino and relative component. Encode even when there is no relative component. This is primarily needed by the NFS reexport code. Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/mds_client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index fee028b5332e..86c59e16ba74 100644
--- a/fs/ceph/mds_client.c
+++ b/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);