Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes

[deliverable/linux.git] / include / linux / ceph / decode.h

diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index a6ef9cc267ec2cfd3940bab1d8e4f7030e31ef7b..19e9932f3e77194eae3f9be57b66fdfa74afbf51 100644 (file)
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -47,7 +47,7 @@ static inline void ceph_decode_copy(void **p, void *pv, size_t n)
 /*
  * bounds check input.
  */
-static inline int ceph_has_room(void **p, void *end, size_t n)
+static inline bool ceph_has_room(void **p, void *end, size_t n)
 {
        return end >= *p && n <= end - *p;
 }