diff options
| author | Zhang Zhuoyu <zhangzhuoyu@cmss.chinamobile.com> | 2016-03-25 05:18:39 -0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-05-25 19:15:39 -0400 |
| commit | 3b33f692c84c28cc8178aaeeb9264d82b48787f1 (patch) | |
| tree | c2d56a816c39928e5c82b6fde4d233b800f2a8fb /include/linux/ceph | |
| parent | 224a7542b8fdde3cc7c600f8b0870c5541a9f678 (diff) | |
ceph: make logical calculation functions return bool
This patch makes serverl logical caculation functions return bool to
improve readability due to these particular functions only using 0/1
as their return value.
No functional change.
Signed-off-by: Zhang Zhuoyu <zhangzhuoyu@cmss.chinamobile.com>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/ceph_frag.h | 4 | ||||
| -rw-r--r-- | include/linux/ceph/decode.h | 2 | ||||
| -rw-r--r-- | include/linux/ceph/osdmap.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/ceph/ceph_frag.h b/include/linux/ceph/ceph_frag.h index b827e066e55a..146507df8650 100644 --- a/include/linux/ceph/ceph_frag.h +++ b/include/linux/ceph/ceph_frag.h | |||
| @@ -51,11 +51,11 @@ static inline __u32 ceph_frag_make_child(__u32 f, int by, int i) | |||
| 51 | return ceph_frag_make(newbits, | 51 | return ceph_frag_make(newbits, |
| 52 | ceph_frag_value(f) | (i << (24 - newbits))); | 52 | ceph_frag_value(f) | (i << (24 - newbits))); |
| 53 | } | 53 | } |
| 54 | static inline int ceph_frag_is_leftmost(__u32 f) | 54 | static inline bool ceph_frag_is_leftmost(__u32 f) |
| 55 | { | 55 | { |
| 56 | return ceph_frag_value(f) == 0; | 56 | return ceph_frag_value(f) == 0; |
| 57 | } | 57 | } |
| 58 | static inline int ceph_frag_is_rightmost(__u32 f) | 58 | static inline bool ceph_frag_is_rightmost(__u32 f) |
| 59 | { | 59 | { |
| 60 | return ceph_frag_value(f) == ceph_frag_mask(f); | 60 | return ceph_frag_value(f) == ceph_frag_mask(f); |
| 61 | } | 61 | } |
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h index a6ef9cc267ec..19e9932f3e77 100644 --- 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) | |||
| 47 | /* | 47 | /* |
| 48 | * bounds check input. | 48 | * bounds check input. |
| 49 | */ | 49 | */ |
| 50 | static inline int ceph_has_room(void **p, void *end, size_t n) | 50 | static inline bool ceph_has_room(void **p, void *end, size_t n) |
| 51 | { | 51 | { |
| 52 | return end >= *p && n <= end - *p; | 52 | return end >= *p && n <= end - *p; |
| 53 | } | 53 | } |
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h index 821e16fff39a..ddc426b22d81 100644 --- a/include/linux/ceph/osdmap.h +++ b/include/linux/ceph/osdmap.h | |||
| @@ -172,19 +172,19 @@ struct ceph_osdmap { | |||
| 172 | int crush_scratch_ary[CEPH_PG_MAX_SIZE * 3]; | 172 | int crush_scratch_ary[CEPH_PG_MAX_SIZE * 3]; |
| 173 | }; | 173 | }; |
| 174 | 174 | ||
| 175 | static inline int ceph_osd_exists(struct ceph_osdmap *map, int osd) | 175 | static inline bool ceph_osd_exists(struct ceph_osdmap *map, int osd) |
| 176 | { | 176 | { |
| 177 | return osd >= 0 && osd < map->max_osd && | 177 | return osd >= 0 && osd < map->max_osd && |
| 178 | (map->osd_state[osd] & CEPH_OSD_EXISTS); | 178 | (map->osd_state[osd] & CEPH_OSD_EXISTS); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | static inline int ceph_osd_is_up(struct ceph_osdmap *map, int osd) | 181 | static inline bool ceph_osd_is_up(struct ceph_osdmap *map, int osd) |
| 182 | { | 182 | { |
| 183 | return ceph_osd_exists(map, osd) && | 183 | return ceph_osd_exists(map, osd) && |
| 184 | (map->osd_state[osd] & CEPH_OSD_UP); | 184 | (map->osd_state[osd] & CEPH_OSD_UP); |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | static inline int ceph_osd_is_down(struct ceph_osdmap *map, int osd) | 187 | static inline bool ceph_osd_is_down(struct ceph_osdmap *map, int osd) |
| 188 | { | 188 | { |
| 189 | return !ceph_osd_is_up(map, osd); | 189 | return !ceph_osd_is_up(map, osd); |
| 190 | } | 190 | } |
