From 298ea98c84c9bb7384593aa5a78bb38b329528a7 Mon Sep 17 00:00:00 2001
From: David Zafman <david.zafman@inktank.com>
Date: Thu, 25 Oct 2012 10:23:46 -0700
Subject: [PATCH] --- yaml --- r: 347563 b: refs/heads/master c:
 b000056a5a8d3f5a4a9fb80184a7ec14f86a43d4 h: refs/heads/master i:   347561:
 4e99acd86f126b8834295f05da5e77aae655aab2   347559:
 b97ea2fa1dbb98b1d0eba17c07e6589e9f88b314 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 807c523e39be..49bc270a8fea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7246240c7c186542f73af4fadc744d66440f616f
+refs/heads/master: b000056a5a8d3f5a4a9fb80184a7ec14f86a43d4
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index 1bcf712655d9..62d2342eb267 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/fs/ceph/mds_client.c
@@ -1590,7 +1590,7 @@ static int set_request_path_attr(struct inode *rinode, struct dentry *rdentry,
 	} else if (rpath || rino) {
 		*ino = rino;
 		*ppath = rpath;
-		*pathlen = strlen(rpath);
+		*pathlen = rpath ? strlen(rpath) : 0;
 		dout(" path %.*s\n", *pathlen, rpath);
 	}