diff --git a/[refs] b/[refs]
index 8231374f761e..150c41bce9f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8842b3be96c376f174ae0d4f282d14728ad5febf
+refs/heads/master: c61a1abd215c1ccd6fa73104c79e79987ed3aa98
diff --git a/trunk/include/linux/ceph/decode.h b/trunk/include/linux/ceph/decode.h
index d8615dee5808..bcbd66c84890 100644
--- a/trunk/include/linux/ceph/decode.h
+++ b/trunk/include/linux/ceph/decode.h
@@ -151,7 +151,7 @@ static inline void ceph_encode_filepath(void **p, void *end,
 					u64 ino, const char *path)
 {
 	u32 len = path ? strlen(path) : 0;
-	BUG_ON(*p + sizeof(ino) + sizeof(len) + len > end);
+	BUG_ON(*p + 1 + sizeof(ino) + sizeof(len) + len > end);
 	ceph_encode_8(p, 1);
 	ceph_encode_64(p, ino);
 	ceph_encode_32(p, len);