From 8bf825e5136403e23f886de888a0790c5fd299a5 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Tue, 3 Jul 2012 16:01:18 -0500 Subject: [PATCH] --- yaml --- r: 320311 b: refs/heads/master c: c61a1abd215c1ccd6fa73104c79e79987ed3aa98 h: refs/heads/master i: 320309: aeffe4ce55c4ab68d4d4e70ca6003d3ff5618e0e 320307: f659f67d142498b80fecb3dfce8891be51f09b4b 320303: 2ab1d8c0451e07220eac9dba6b9161e788cd7e48 v: v3 --- [refs] | 2 +- trunk/include/linux/ceph/decode.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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);