Skip to content

L
linux
Commit d8f183b3 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files
Options

staging: lustre: use bool for several function in lustre_idl.h/lustre_fid.h 

Change the return type of several predicate functions from int to bool.
Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/8641Reviewed-by: default avatarwangdi <di.wang@intel.com>
Reviewed-by: default avatarFan Yong <fan.yong@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac8f0a5c
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
View file @ d8f183b3
...@@ -196,12 +196,12 @@ static inline unsigned fld_range_type(const struct lu_seq_range *range) ...@@ -196,12 +196,12 @@ static inline unsigned fld_range_type(const struct lu_seq_range *range)
return range->lsr_flags & LU_SEQ_RANGE_MASK; return range->lsr_flags & LU_SEQ_RANGE_MASK;
} }
static inline int fld_range_is_ost(const struct lu_seq_range *range) static inline bool fld_range_is_ost(const struct lu_seq_range *range)
{ {
return fld_range_type(range) == LU_SEQ_RANGE_OST; return fld_range_type(range) == LU_SEQ_RANGE_OST;
} }
static inline int fld_range_is_mdt(const struct lu_seq_range *range) static inline bool fld_range_is_mdt(const struct lu_seq_range *range)
{ {
return fld_range_type(range) == LU_SEQ_RANGE_MDT; return fld_range_type(range) == LU_SEQ_RANGE_MDT;
} }
...@@ -260,23 +260,23 @@ static inline void range_init(struct lu_seq_range *range) ...@@ -260,23 +260,23 @@ static inline void range_init(struct lu_seq_range *range)
* check if given seq id \a s is within given range \a r * check if given seq id \a s is within given range \a r
*/ */
static inline int range_within(const struct lu_seq_range *range, static inline bool range_within(const struct lu_seq_range *range,
__u64 s) __u64 s)
{ {
return s >= range->lsr_start && s < range->lsr_end; return s >= range->lsr_start && s < range->lsr_end;
} }
static inline int range_is_sane(const struct lu_seq_range *range) static inline bool range_is_sane(const struct lu_seq_range *range)
{ {
return (range->lsr_end >= range->lsr_start); return (range->lsr_end >= range->lsr_start);
} }
static inline int range_is_zero(const struct lu_seq_range *range) static inline bool range_is_zero(const struct lu_seq_range *range)
{ {
return (range->lsr_start == 0 && range->lsr_end == 0); return (range->lsr_start == 0 && range->lsr_end == 0);
} }
static inline int range_is_exhausted(const struct lu_seq_range *range) static inline bool range_is_exhausted(const struct lu_seq_range *range)
{ {
return range_space(range) == 0; return range_space(range) == 0;
...@@ -437,69 +437,69 @@ enum dot_lustre_oid { ...@@ -437,69 +437,69 @@ enum dot_lustre_oid {
FID_OID_DOT_LUSTRE_OBF = 2UL, FID_OID_DOT_LUSTRE_OBF = 2UL,
}; };
static inline int fid_seq_is_mdt0(__u64 seq) static inline bool fid_seq_is_mdt0(__u64 seq)
{ {
return (seq == FID_SEQ_OST_MDT0); return (seq == FID_SEQ_OST_MDT0);
} }
static inline int fid_seq_is_mdt(__u64 seq) static inline bool fid_seq_is_mdt(__u64 seq)
{ {
return seq == FID_SEQ_OST_MDT0 || seq >= FID_SEQ_NORMAL; return seq == FID_SEQ_OST_MDT0 || seq >= FID_SEQ_NORMAL;
}; };
static inline int fid_seq_is_echo(__u64 seq) static inline bool fid_seq_is_echo(__u64 seq)
{ {
return (seq == FID_SEQ_ECHO); return (seq == FID_SEQ_ECHO);
} }
static inline int fid_is_echo(const struct lu_fid *fid) static inline bool fid_is_echo(const struct lu_fid *fid)
{ {
return fid_seq_is_echo(fid_seq(fid)); return fid_seq_is_echo(fid_seq(fid));
} }
static inline int fid_seq_is_llog(__u64 seq) static inline bool fid_seq_is_llog(__u64 seq)
{ {
return (seq == FID_SEQ_LLOG); return (seq == FID_SEQ_LLOG);
} }
static inline int fid_is_llog(const struct lu_fid *fid) static inline bool fid_is_llog(const struct lu_fid *fid)
{ {
/* file with OID == 0 is not llog but contains last oid */ /* file with OID == 0 is not llog but contains last oid */
return fid_seq_is_llog(fid_seq(fid)) && fid_oid(fid) > 0; return fid_seq_is_llog(fid_seq(fid)) && fid_oid(fid) > 0;
} }
static inline int fid_seq_is_rsvd(__u64 seq) static inline bool fid_seq_is_rsvd(__u64 seq)
{ {
return (seq > FID_SEQ_OST_MDT0 && seq <= FID_SEQ_RSVD); return (seq > FID_SEQ_OST_MDT0 && seq <= FID_SEQ_RSVD);
}; };
static inline int fid_seq_is_special(__u64 seq) static inline bool fid_seq_is_special(__u64 seq)
{ {
return seq == FID_SEQ_SPECIAL; return seq == FID_SEQ_SPECIAL;
}; };
static inline int fid_seq_is_local_file(__u64 seq) static inline bool fid_seq_is_local_file(__u64 seq)
{ {
return seq == FID_SEQ_LOCAL_FILE || return seq == FID_SEQ_LOCAL_FILE ||
seq == FID_SEQ_LOCAL_NAME; seq == FID_SEQ_LOCAL_NAME;
}; };
static inline int fid_seq_is_root(__u64 seq) static inline bool fid_seq_is_root(__u64 seq)
{ {
return seq == FID_SEQ_ROOT; return seq == FID_SEQ_ROOT;
} }
static inline int fid_seq_is_dot(__u64 seq) static inline bool fid_seq_is_dot(__u64 seq)
{ {
return seq == FID_SEQ_DOT_LUSTRE; return seq == FID_SEQ_DOT_LUSTRE;
} }
static inline int fid_seq_is_default(__u64 seq) static inline bool fid_seq_is_default(__u64 seq)
{ {
return seq == FID_SEQ_LOV_DEFAULT; return seq == FID_SEQ_LOV_DEFAULT;
} }
static inline int fid_is_mdt0(const struct lu_fid *fid) static inline bool fid_is_mdt0(const struct lu_fid *fid)
{ {
return fid_seq_is_mdt0(fid_seq(fid)); return fid_seq_is_mdt0(fid_seq(fid));
} }
...@@ -516,12 +516,12 @@ static inline void lu_root_fid(struct lu_fid *fid) ...@@ -516,12 +516,12 @@ static inline void lu_root_fid(struct lu_fid *fid)
* \param fid the fid to be tested. * \param fid the fid to be tested.
* \return true if the fid is a igif; otherwise false. * \return true if the fid is a igif; otherwise false.
*/ */
static inline int fid_seq_is_igif(__u64 seq) static inline bool fid_seq_is_igif(__u64 seq)
{ {
return seq >= FID_SEQ_IGIF && seq <= FID_SEQ_IGIF_MAX; return seq >= FID_SEQ_IGIF && seq <= FID_SEQ_IGIF_MAX;
} }
static inline int fid_is_igif(const struct lu_fid *fid) static inline bool fid_is_igif(const struct lu_fid *fid)
{ {
return fid_seq_is_igif(fid_seq(fid)); return fid_seq_is_igif(fid_seq(fid));
} }
...@@ -531,27 +531,27 @@ static inline int fid_is_igif(const struct lu_fid *fid) ...@@ -531,27 +531,27 @@ static inline int fid_is_igif(const struct lu_fid *fid)
* \param fid the fid to be tested. * \param fid the fid to be tested.
* \return true if the fid is a idif; otherwise false. * \return true if the fid is a idif; otherwise false.
*/ */
static inline int fid_seq_is_idif(__u64 seq) static inline bool fid_seq_is_idif(__u64 seq)
{ {
return seq >= FID_SEQ_IDIF && seq <= FID_SEQ_IDIF_MAX; return seq >= FID_SEQ_IDIF && seq <= FID_SEQ_IDIF_MAX;
} }
static inline int fid_is_idif(const struct lu_fid *fid) static inline bool fid_is_idif(const struct lu_fid *fid)
{ {
return fid_seq_is_idif(fid_seq(fid)); return fid_seq_is_idif(fid_seq(fid));
} }
static inline int fid_is_local_file(const struct lu_fid *fid) static inline bool fid_is_local_file(const struct lu_fid *fid)
{ {
return fid_seq_is_local_file(fid_seq(fid)); return fid_seq_is_local_file(fid_seq(fid));
} }
static inline int fid_seq_is_norm(__u64 seq) static inline bool fid_seq_is_norm(__u64 seq)
{ {
return (seq >= FID_SEQ_NORMAL); return (seq >= FID_SEQ_NORMAL);
} }
static inline int fid_is_norm(const struct lu_fid *fid) static inline bool fid_is_norm(const struct lu_fid *fid)
{ {
return fid_seq_is_norm(fid_seq(fid)); return fid_seq_is_norm(fid_seq(fid));
} }
...@@ -769,7 +769,7 @@ static inline int fid_to_ostid(const struct lu_fid *fid, struct ost_id *ostid) ...@@ -769,7 +769,7 @@ static inline int fid_to_ostid(const struct lu_fid *fid, struct ost_id *ostid)
} }
/* Check whether the fid is for LAST_ID */ /* Check whether the fid is for LAST_ID */
static inline int fid_is_last_id(const struct lu_fid *fid) static inline bool fid_is_last_id(const struct lu_fid *fid)
{ {
return (fid_oid(fid) == 0); return (fid_oid(fid) == 0);
} }
...@@ -838,7 +838,7 @@ static inline void fid_be_to_cpu(struct lu_fid *dst, const struct lu_fid *src) ...@@ -838,7 +838,7 @@ static inline void fid_be_to_cpu(struct lu_fid *dst, const struct lu_fid *src)
dst->f_ver = be32_to_cpu(fid_ver(src)); dst->f_ver = be32_to_cpu(fid_ver(src));
} }
static inline int fid_is_sane(const struct lu_fid *fid) static inline bool fid_is_sane(const struct lu_fid *fid)
{ {
return fid && return fid &&
((fid_seq(fid) >= FID_SEQ_START && fid_ver(fid) == 0) || ((fid_seq(fid) >= FID_SEQ_START && fid_ver(fid) == 0) ||
...@@ -846,7 +846,7 @@ static inline int fid_is_sane(const struct lu_fid *fid) ...@@ -846,7 +846,7 @@ static inline int fid_is_sane(const struct lu_fid *fid)
fid_seq_is_rsvd(fid_seq(fid))); fid_seq_is_rsvd(fid_seq(fid)));
} }
static inline int fid_is_zero(const struct lu_fid *fid) static inline bool fid_is_zero(const struct lu_fid *fid)
{ {
return fid_seq(fid) == 0 && fid_oid(fid) == 0; return fid_seq(fid) == 0 && fid_oid(fid) == 0;
} }
...@@ -854,7 +854,7 @@ static inline int fid_is_zero(const struct lu_fid *fid) ...@@ -854,7 +854,7 @@ static inline int fid_is_zero(const struct lu_fid *fid)
void lustre_swab_lu_fid(struct lu_fid *fid); void lustre_swab_lu_fid(struct lu_fid *fid);
void lustre_swab_lu_seq_range(struct lu_seq_range *range); void lustre_swab_lu_seq_range(struct lu_seq_range *range);
static inline int lu_fid_eq(const struct lu_fid *f0, const struct lu_fid *f1) static inline bool lu_fid_eq(const struct lu_fid *f0, const struct lu_fid *f1)
{ {
return memcmp(f0, f1, sizeof(*f0)) == 0; return memcmp(f0, f1, sizeof(*f0)) == 0;
} }
...@@ -1067,13 +1067,13 @@ struct lustre_handle { ...@@ -1067,13 +1067,13 @@ struct lustre_handle {
#define DEAD_HANDLE_MAGIC 0xdeadbeefcafebabeULL #define DEAD_HANDLE_MAGIC 0xdeadbeefcafebabeULL
static inline int lustre_handle_is_used(const struct lustre_handle *lh) static inline bool lustre_handle_is_used(const struct lustre_handle *lh)
{ {
return lh->cookie != 0ull; return lh->cookie != 0ull;
} }
static inline int lustre_handle_equal(const struct lustre_handle *lh1, static inline bool lustre_handle_equal(const struct lustre_handle *lh1,
const struct lustre_handle *lh2) const struct lustre_handle *lh2)
{ {
return lh1->cookie == lh2->cookie; return lh1->cookie == lh2->cookie;
} }
...@@ -2684,8 +2684,8 @@ struct ldlm_res_id { ...@@ -2684,8 +2684,8 @@ struct ldlm_res_id {
#define PLDLMRES(res) (res)->lr_name.name[0], (res)->lr_name.name[1], \ #define PLDLMRES(res) (res)->lr_name.name[0], (res)->lr_name.name[1], \
(res)->lr_name.name[2], (res)->lr_name.name[3] (res)->lr_name.name[2], (res)->lr_name.name[3]
static inline int ldlm_res_eq(const struct ldlm_res_id *res0, static inline bool ldlm_res_eq(const struct ldlm_res_id *res0,
const struct ldlm_res_id *res1) const struct ldlm_res_id *res1)
{ {
return !memcmp(res0, res1, sizeof(*res0)); return !memcmp(res0, res1, sizeof(*res0));
} }
......
drivers/staging/lustre/lustre/include/lustre_fid.h
View file @ d8f183b3
...@@ -406,8 +406,8 @@ fid_build_reg_res_name(const struct lu_fid *fid, struct ldlm_res_id *res) ...@@ -406,8 +406,8 @@ fid_build_reg_res_name(const struct lu_fid *fid, struct ldlm_res_id *res)
/* /*
* Return true if resource is for object identified by FID. * Return true if resource is for object identified by FID.
*/ */
static inline int fid_res_name_eq(const struct lu_fid *fid, static inline bool fid_res_name_eq(const struct lu_fid *fid,
const struct ldlm_res_id *res) const struct ldlm_res_id *res)
{ {
return res->name[LUSTRE_RES_ID_SEQ_OFF] == fid_seq(fid) && return res->name[LUSTRE_RES_ID_SEQ_OFF] == fid_seq(fid) &&
res->name[LUSTRE_RES_ID_VER_OID_OFF] == fid_ver_oid(fid); res->name[LUSTRE_RES_ID_VER_OID_OFF] == fid_ver_oid(fid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7