From 38ebc5d8fcca131a51f7c6041776c736603c9341 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 6 Mar 2019 09:59:45 -0500 Subject: [PATCH] mds: use stdbool.h instead of hand-rolling our own bool type Signed-off-by: Jeff Layton --- src/include/rados.h | 3 ++- src/mds/locks.c | 5 ----- src/mds/locks.h | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/include/rados.h b/src/include/rados.h index e8b05f2d7651d..59bd771c15e3c 100644 --- a/src/include/rados.h +++ b/src/include/rados.h @@ -7,6 +7,7 @@ */ #include +#include #include "msgr.h" /* @@ -395,7 +396,7 @@ static inline int ceph_osd_op_mode_cache(int op) { return op & CEPH_OSD_OP_MODE_CACHE; } -static inline int ceph_osd_op_uses_extent(int op) +static inline bool ceph_osd_op_uses_extent(int op) { switch(op) { case CEPH_OSD_OP_READ: diff --git a/src/mds/locks.c b/src/mds/locks.c index c788407fb0af4..e057400de2571 100644 --- a/src/mds/locks.c +++ b/src/mds/locks.c @@ -1,8 +1,3 @@ -// there must be a better way? -typedef char bool; -#define false 0 -#define true 1 - #include "include/int_types.h" #include diff --git a/src/mds/locks.h b/src/mds/locks.h index 5199326723e64..e6fdc1cfc43e0 100644 --- a/src/mds/locks.h +++ b/src/mds/locks.h @@ -1,10 +1,10 @@ - #ifndef CEPH_MDS_LOCKS_H #define CEPH_MDS_LOCKS_H +#include struct sm_state_t { int next; // 0 if stable - char loner; + bool loner; int replica_state; char can_read; char can_read_projected; -- 2.39.5