recent c++ compilers did not like some of the C idioms used in this
header:
- C++ checks the types of enums more forecfully than is done in C
- signed vs unsigned comparisons will generate a warning under g++
- "invalid suffix on literal" warning: Lustre is not trying to
generate a new literal identifier.
Signed-off-by: Rob Latham <robl@mcs.anl.gov>
Change-Id: I6aa8ba18407c14e071a7e2943b5a1a3f5be27bac
Reviewed-on: https://review.whamcloud.com/35471
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
#define FID_NOBRACE_LEN 40
#define FID_LEN (FID_NOBRACE_LEN + 2)
#define DFID_NOBRACE "%#llx:0x%x:0x%x"
#define FID_NOBRACE_LEN 40
#define FID_LEN (FID_NOBRACE_LEN + 2)
#define DFID_NOBRACE "%#llx:0x%x:0x%x"
-#define DFID "["DFID_NOBRACE"]"
+#define DFID "[" DFID_NOBRACE "]"
#define PFID(fid) (unsigned long long)(fid)->f_seq, (fid)->f_oid, (fid)->f_ver
/* scanf input parse format for fids in DFID_NOBRACE format
#define PFID(fid) (unsigned long long)(fid)->f_seq, (fid)->f_oid, (fid)->f_ver
/* scanf input parse format for fids in DFID_NOBRACE format
#define LQUOTA_FLAG_DEFAULT 0x0001
#define ALLQUOTA 255 /* set all quota */
#define LQUOTA_FLAG_DEFAULT 0x0001
#define ALLQUOTA 255 /* set all quota */
-static inline char *qtype_name(int qtype)
+static inline const char *qtype_name(int qtype)
{
switch (qtype) {
case USRQUOTA:
{
switch (qtype) {
case USRQUOTA:
static inline void hsm_set_cl_event(enum changelog_rec_flags *clf_flags,
enum hsm_event he)
{
static inline void hsm_set_cl_event(enum changelog_rec_flags *clf_flags,
enum hsm_event he)
{
- *clf_flags |= (he << CLF_HSM_EVENT_L);
+ *clf_flags = (enum changelog_rec_flags)
+ (*clf_flags | (he << CLF_HSM_EVENT_L));
}
static inline __u16 hsm_get_cl_flags(enum changelog_rec_flags clf_flags)
}
static inline __u16 hsm_get_cl_flags(enum changelog_rec_flags clf_flags)
static inline void hsm_set_cl_flags(enum changelog_rec_flags *clf_flags,
unsigned int bits)
{
static inline void hsm_set_cl_flags(enum changelog_rec_flags *clf_flags,
unsigned int bits)
{
- *clf_flags |= (bits << CLF_HSM_FLAG_L);
+ *clf_flags = (enum changelog_rec_flags)
+ (*clf_flags | (bits << CLF_HSM_FLAG_L));
}
static inline int hsm_get_cl_error(enum changelog_rec_flags clf_flags)
}
static inline int hsm_get_cl_error(enum changelog_rec_flags clf_flags)
static inline void hsm_set_cl_error(enum changelog_rec_flags *clf_flags,
unsigned int error)
{
static inline void hsm_set_cl_error(enum changelog_rec_flags *clf_flags,
unsigned int error)
{
- *clf_flags |= (error << CLF_HSM_ERR_L);
+ *clf_flags = (enum changelog_rec_flags)
+ (*clf_flags | (error << CLF_HSM_ERR_L));
}
enum changelog_rec_extra_flags {
}
enum changelog_rec_extra_flags {
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
- cref = changelog_rec_extra_flags(rec)->cr_extra_flags;
+ cref = (enum changelog_rec_extra_flags)
+ changelog_rec_extra_flags(rec)->cr_extra_flags;
- return changelog_rec_offset(rec->cr_flags, cref);
+ return changelog_rec_offset(
+ (enum changelog_rec_flags)rec->cr_flags, cref);
}
static inline size_t changelog_rec_varsize(const struct changelog_rec *rec)
}
static inline size_t changelog_rec_varsize(const struct changelog_rec *rec)
static inline
struct changelog_ext_rename *changelog_rec_rename(const struct changelog_rec *rec)
{
static inline
struct changelog_ext_rename *changelog_rec_rename(const struct changelog_rec *rec)
{
- enum changelog_rec_flags crf = rec->cr_flags & CLF_VERSION;
+ enum changelog_rec_flags crf = (enum changelog_rec_flags)
+ (rec->cr_flags & CLF_VERSION);
return (struct changelog_ext_rename *)((char *)rec +
changelog_rec_offset(crf,
return (struct changelog_ext_rename *)((char *)rec +
changelog_rec_offset(crf,
static inline
struct changelog_ext_jobid *changelog_rec_jobid(const struct changelog_rec *rec)
{
static inline
struct changelog_ext_jobid *changelog_rec_jobid(const struct changelog_rec *rec)
{
- enum changelog_rec_flags crf = rec->cr_flags &
- (CLF_VERSION | CLF_RENAME);
+ enum changelog_rec_flags crf = (enum changelog_rec_flags)
+ (rec->cr_flags & (CLF_VERSION | CLF_RENAME));
return (struct changelog_ext_jobid *)((char *)rec +
changelog_rec_offset(crf,
return (struct changelog_ext_jobid *)((char *)rec +
changelog_rec_offset(crf,
struct changelog_ext_extra_flags *changelog_rec_extra_flags(
const struct changelog_rec *rec)
{
struct changelog_ext_extra_flags *changelog_rec_extra_flags(
const struct changelog_rec *rec)
{
- enum changelog_rec_flags crf = rec->cr_flags &
- (CLF_VERSION | CLF_RENAME | CLF_JOBID);
+ enum changelog_rec_flags crf = (enum changelog_rec_flags)
+ (rec->cr_flags & (CLF_VERSION | CLF_RENAME | CLF_JOBID));
return (struct changelog_ext_extra_flags *)((char *)rec +
changelog_rec_offset(crf,
return (struct changelog_ext_extra_flags *)((char *)rec +
changelog_rec_offset(crf,
struct changelog_ext_uidgid *changelog_rec_uidgid(
const struct changelog_rec *rec)
{
struct changelog_ext_uidgid *changelog_rec_uidgid(
const struct changelog_rec *rec)
{
- enum changelog_rec_flags crf = rec->cr_flags &
- (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS);
+ enum changelog_rec_flags crf = (enum changelog_rec_flags)
+ (rec->cr_flags &
+ (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS));
return (struct changelog_ext_uidgid *)((char *)rec +
changelog_rec_offset(crf,
return (struct changelog_ext_uidgid *)((char *)rec +
changelog_rec_offset(crf,
static inline
struct changelog_ext_nid *changelog_rec_nid(const struct changelog_rec *rec)
{
static inline
struct changelog_ext_nid *changelog_rec_nid(const struct changelog_rec *rec)
{
- enum changelog_rec_flags crf = rec->cr_flags &
- (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS);
+ enum changelog_rec_flags crf = (enum changelog_rec_flags)
+ (rec->cr_flags &
+ (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS));
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
- cref = changelog_rec_extra_flags(rec)->cr_extra_flags &
- CLFE_UIDGID;
+ cref = (enum changelog_rec_extra_flags)
+ (changelog_rec_extra_flags(rec)->cr_extra_flags &
+ CLFE_UIDGID);
return (struct changelog_ext_nid *)((char *)rec +
changelog_rec_offset(crf, cref));
return (struct changelog_ext_nid *)((char *)rec +
changelog_rec_offset(crf, cref));
struct changelog_ext_openmode *changelog_rec_openmode(
const struct changelog_rec *rec)
{
struct changelog_ext_openmode *changelog_rec_openmode(
const struct changelog_rec *rec)
{
- enum changelog_rec_flags crf = rec->cr_flags &
- (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS);
+ enum changelog_rec_flags crf = (enum changelog_rec_flags)
+ (rec->cr_flags &
+ (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS));
enum changelog_rec_extra_flags cref = CLFE_INVALID;
enum changelog_rec_extra_flags cref = CLFE_INVALID;
- if (rec->cr_flags & CLF_EXTRA_FLAGS)
- cref = changelog_rec_extra_flags(rec)->cr_extra_flags &
- (CLFE_UIDGID | CLFE_NID);
+ if (rec->cr_flags & CLF_EXTRA_FLAGS) {
+ cref = (enum changelog_rec_extra_flags)
+ (changelog_rec_extra_flags(rec)->cr_extra_flags &
+ (CLFE_UIDGID | CLFE_NID));
+ }
return (struct changelog_ext_openmode *)((char *)rec +
changelog_rec_offset(crf, cref));
return (struct changelog_ext_openmode *)((char *)rec +
changelog_rec_offset(crf, cref));
struct changelog_ext_xattr *changelog_rec_xattr(
const struct changelog_rec *rec)
{
struct changelog_ext_xattr *changelog_rec_xattr(
const struct changelog_rec *rec)
{
- enum changelog_rec_flags crf = rec->cr_flags &
- (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS);
+ enum changelog_rec_flags crf = (enum changelog_rec_flags)
+ (rec->cr_flags &
+ (CLF_VERSION | CLF_RENAME | CLF_JOBID | CLF_EXTRA_FLAGS));
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
- cref = changelog_rec_extra_flags(rec)->cr_extra_flags &
- (CLFE_UIDGID | CLFE_NID | CLFE_OPEN);
+ cref = (enum changelog_rec_extra_flags)
+ (changelog_rec_extra_flags(rec)->cr_extra_flags &
+ (CLFE_UIDGID | CLFE_NID | CLFE_OPEN));
return (struct changelog_ext_xattr *)((char *)rec +
changelog_rec_offset(crf, cref));
return (struct changelog_ext_xattr *)((char *)rec +
changelog_rec_offset(crf, cref));
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
enum changelog_rec_extra_flags cref = CLFE_INVALID;
if (rec->cr_flags & CLF_EXTRA_FLAGS)
- cref = changelog_rec_extra_flags(rec)->cr_extra_flags;
+ cref = (enum changelog_rec_extra_flags)
+ changelog_rec_extra_flags(rec)->cr_extra_flags;
- return (char *)rec + changelog_rec_offset(rec->cr_flags & CLF_SUPPORTED,
- cref & CLFE_SUPPORTED);
+ return (char *)rec + changelog_rec_offset(
+ (enum changelog_rec_flags)(rec->cr_flags & CLF_SUPPORTED),
+ (enum changelog_rec_extra_flags)(cref & CLFE_SUPPORTED));
}
static inline size_t changelog_rec_snamelen(const struct changelog_rec *rec)
}
static inline size_t changelog_rec_snamelen(const struct changelog_rec *rec)
char *rnm_mov;
enum changelog_rec_extra_flags cref = CLFE_INVALID;
char *rnm_mov;
enum changelog_rec_extra_flags cref = CLFE_INVALID;
- crf_wanted &= CLF_SUPPORTED;
- cref_want &= CLFE_SUPPORTED;
+ crf_wanted = (enum changelog_rec_flags)
+ (crf_wanted & CLF_SUPPORTED);
+ cref_want = (enum changelog_rec_extra_flags)
+ (cref_want & CLFE_SUPPORTED);
if ((rec->cr_flags & CLF_SUPPORTED) == crf_wanted) {
if (!(rec->cr_flags & CLF_EXTRA_FLAGS) ||
if ((rec->cr_flags & CLF_SUPPORTED) == crf_wanted) {
if (!(rec->cr_flags & CLF_EXTRA_FLAGS) ||
/* Locations of extensions in the remapped record */
if (rec->cr_flags & CLF_EXTRA_FLAGS) {
xattr_mov = (char *)rec +
/* Locations of extensions in the remapped record */
if (rec->cr_flags & CLF_EXTRA_FLAGS) {
xattr_mov = (char *)rec +
- changelog_rec_offset(crf_wanted & CLF_SUPPORTED,
- cref_want & ~CLFE_XATTR);
+ changelog_rec_offset(
+ (enum changelog_rec_flags)
+ (crf_wanted & CLF_SUPPORTED),
+ (enum changelog_rec_extra_flags)
+ (cref_want & ~CLFE_XATTR));
- changelog_rec_offset(crf_wanted & CLF_SUPPORTED,
- cref_want & ~(CLFE_OPEN |
- CLFE_XATTR));
+ changelog_rec_offset(
+ (enum changelog_rec_flags)
+ (crf_wanted & CLF_SUPPORTED),
+ (enum changelog_rec_extra_flags)
+ (cref_want & ~(CLFE_OPEN | CLFE_XATTR)));
- changelog_rec_offset(crf_wanted & CLF_SUPPORTED,
- cref_want & ~(CLFE_NID |
- CLFE_OPEN |
- CLFE_XATTR));
+ changelog_rec_offset(
+ (enum changelog_rec_flags)
+ (crf_wanted & CLF_SUPPORTED),
+ (enum changelog_rec_extra_flags)
+ (cref_want &
+ ~(CLFE_NID | CLFE_OPEN | CLFE_XATTR)));
uidgid_mov = (char *)rec +
uidgid_mov = (char *)rec +
- changelog_rec_offset(crf_wanted & CLF_SUPPORTED,
- cref_want & ~(CLFE_UIDGID |
+ changelog_rec_offset(
+ (enum changelog_rec_flags)
+ (crf_wanted & CLF_SUPPORTED),
+ (enum changelog_rec_extra_flags)
+ (cref_want & ~(CLFE_UIDGID |
- CLFE_XATTR));
- cref = changelog_rec_extra_flags(rec)->cr_extra_flags;
+ CLFE_XATTR)));
+ cref = (enum changelog_rec_extra_flags)
+ changelog_rec_extra_flags(rec)->cr_extra_flags;
- changelog_rec_offset(crf_wanted & ~CLF_EXTRA_FLAGS,
- CLFE_INVALID);
+ changelog_rec_offset(
+ (enum changelog_rec_flags)
+ (crf_wanted & ~CLF_EXTRA_FLAGS), CLFE_INVALID);
- changelog_rec_offset(crf_wanted &
- ~(CLF_EXTRA_FLAGS | CLF_JOBID),
+ changelog_rec_offset((enum changelog_rec_flags)(crf_wanted &
+ ~(CLF_EXTRA_FLAGS | CLF_JOBID)),
CLFE_INVALID);
rnm_mov = (char *)rec +
CLFE_INVALID);
rnm_mov = (char *)rec +
- changelog_rec_offset(crf_wanted &
+ changelog_rec_offset((enum changelog_rec_flags)(crf_wanted &
~(CLF_EXTRA_FLAGS |
CLF_JOBID |
~(CLF_EXTRA_FLAGS |
CLF_JOBID |
CLFE_INVALID);
/* Move the extension fields to the desired positions */
CLFE_INVALID);
/* Move the extension fields to the desired positions */
(__u64)hur->hur_request.hr_itemcount *
sizeof(hur->hur_user_item[0]) + hur->hur_request.hr_data_len;
(__u64)hur->hur_request.hr_itemcount *
sizeof(hur->hur_user_item[0]) + hur->hur_request.hr_data_len;
- if (size != (ssize_t)size)