Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b33f692 authored by Zhang Zhuoyu's avatar Zhang Zhuoyu Committed by Ilya Dryomov
Browse files

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: default avatarZhang Zhuoyu <zhangzhuoyu@cmss.chinamobile.com>
parent 224a7542

fs/ceph/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static void ceph_vfs_readpage_complete_unlock(struct page *page, void *data, int 
	unlock_page(page);

}



static inline int cache_valid(struct ceph_inode_info *ci)

static inline bool cache_valid(struct ceph_inode_info *ci)

{

	return ((ceph_caps_issued(ci) & CEPH_CAP_FILE_CACHE) &&

		(ci->i_fscache_gen == ci->i_rdcache_gen));

fs/ceph/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ struct dentry *ceph_finish_lookup(struct ceph_mds_request *req, 
	return dentry;

}



static int is_root_ceph_dentry(struct inode *inode, struct dentry *dentry)

static bool is_root_ceph_dentry(struct inode *inode, struct dentry *dentry)

{

	return ceph_ino(inode) == CEPH_INO_ROOT &&

		strncmp(dentry->d_name.name, ".ceph", 5) == 0;

include/linux/ceph/ceph_frag.h

+2 −2
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ static inline __u32 ceph_frag_make_child(__u32 f, int by, int i) 
	return ceph_frag_make(newbits,

			 ceph_frag_value(f) | (i << (24 - newbits)));

}

static inline int ceph_frag_is_leftmost(__u32 f)

static inline bool ceph_frag_is_leftmost(__u32 f)

{

	return ceph_frag_value(f) == 0;

}

static inline int ceph_frag_is_rightmost(__u32 f)

static inline bool ceph_frag_is_rightmost(__u32 f)

{

	return ceph_frag_value(f) == ceph_frag_mask(f);

}

include/linux/ceph/decode.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

include/linux/ceph/osdmap.h

+3 −3
Original line number Diff line number Diff line
@@ -172,19 +172,19 @@ struct ceph_osdmap { 
	int crush_scratch_ary[CEPH_PG_MAX_SIZE * 3];

};



static inline int ceph_osd_exists(struct ceph_osdmap *map, int osd)

static inline bool ceph_osd_exists(struct ceph_osdmap *map, int osd)

{

	return osd >= 0 && osd < map->max_osd &&

	       (map->osd_state[osd] & CEPH_OSD_EXISTS);

}



static inline int ceph_osd_is_up(struct ceph_osdmap *map, int osd)

static inline bool ceph_osd_is_up(struct ceph_osdmap *map, int osd)

{

	return ceph_osd_exists(map, osd) &&

	       (map->osd_state[osd] & CEPH_OSD_UP);

}



static inline int ceph_osd_is_down(struct ceph_osdmap *map, int osd)

static inline bool ceph_osd_is_down(struct ceph_osdmap *map, int osd)

{

	return !ceph_osd_is_up(map, osd);

}