Commit ac8f0a5c authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman

staging: lustre: const correct FID/OSTID/... helpers

Add a const qualifier wherever possible to the pointer parameters of
the inline helper functions in lustre_idl.h and lustre_fid.h.
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 f7ee4497
...@@ -1033,7 +1033,7 @@ static inline int lu_dirent_calc_size(int namelen, __u16 attr) ...@@ -1033,7 +1033,7 @@ static inline int lu_dirent_calc_size(int namelen, __u16 attr)
return (size + 7) & ~7; return (size + 7) & ~7;
} }
static inline int lu_dirent_size(struct lu_dirent *ent) static inline int lu_dirent_size(const struct lu_dirent *ent)
{ {
if (le16_to_cpu(ent->lde_reclen) == 0) { if (le16_to_cpu(ent->lde_reclen) == 0) {
return lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen), return lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen),
...@@ -1067,7 +1067,7 @@ struct lustre_handle { ...@@ -1067,7 +1067,7 @@ struct lustre_handle {
#define DEAD_HANDLE_MAGIC 0xdeadbeefcafebabeULL #define DEAD_HANDLE_MAGIC 0xdeadbeefcafebabeULL
static inline int lustre_handle_is_used(struct lustre_handle *lh) static inline int lustre_handle_is_used(const struct lustre_handle *lh)
{ {
return lh->cookie != 0ull; return lh->cookie != 0ull;
} }
...@@ -1079,7 +1079,7 @@ static inline int lustre_handle_equal(const struct lustre_handle *lh1, ...@@ -1079,7 +1079,7 @@ static inline int lustre_handle_equal(const struct lustre_handle *lh1,
} }
static inline void lustre_handle_copy(struct lustre_handle *tgt, static inline void lustre_handle_copy(struct lustre_handle *tgt,
struct lustre_handle *src) const struct lustre_handle *src)
{ {
tgt->cookie = src->cookie; tgt->cookie = src->cookie;
} }
...@@ -1570,25 +1570,25 @@ static inline void lmm_oi_set_id(struct ost_id *oi, __u64 oid) ...@@ -1570,25 +1570,25 @@ static inline void lmm_oi_set_id(struct ost_id *oi, __u64 oid)
oi->oi.oi_id = oid; oi->oi.oi_id = oid;
} }
static inline __u64 lmm_oi_id(struct ost_id *oi) static inline __u64 lmm_oi_id(const struct ost_id *oi)
{ {
return oi->oi.oi_id; return oi->oi.oi_id;
} }
static inline __u64 lmm_oi_seq(struct ost_id *oi) static inline __u64 lmm_oi_seq(const struct ost_id *oi)
{ {
return oi->oi.oi_seq; return oi->oi.oi_seq;
} }
static inline void lmm_oi_le_to_cpu(struct ost_id *dst_oi, static inline void lmm_oi_le_to_cpu(struct ost_id *dst_oi,
struct ost_id *src_oi) const struct ost_id *src_oi)
{ {
dst_oi->oi.oi_id = le64_to_cpu(src_oi->oi.oi_id); dst_oi->oi.oi_id = le64_to_cpu(src_oi->oi.oi_id);
dst_oi->oi.oi_seq = le64_to_cpu(src_oi->oi.oi_seq); dst_oi->oi.oi_seq = le64_to_cpu(src_oi->oi.oi_seq);
} }
static inline void lmm_oi_cpu_to_le(struct ost_id *dst_oi, static inline void lmm_oi_cpu_to_le(struct ost_id *dst_oi,
struct ost_id *src_oi) const struct ost_id *src_oi)
{ {
dst_oi->oi.oi_id = cpu_to_le64(src_oi->oi.oi_id); dst_oi->oi.oi_id = cpu_to_le64(src_oi->oi.oi_id);
dst_oi->oi.oi_seq = cpu_to_le64(src_oi->oi.oi_seq); dst_oi->oi.oi_seq = cpu_to_le64(src_oi->oi.oi_seq);
...@@ -2724,15 +2724,15 @@ struct ldlm_extent { ...@@ -2724,15 +2724,15 @@ struct ldlm_extent {
#define LDLM_GID_ANY ((__u64)-1) #define LDLM_GID_ANY ((__u64)-1)
static inline int ldlm_extent_overlap(struct ldlm_extent *ex1, static inline int ldlm_extent_overlap(const struct ldlm_extent *ex1,
struct ldlm_extent *ex2) const struct ldlm_extent *ex2)
{ {
return (ex1->start <= ex2->end) && (ex2->start <= ex1->end); return (ex1->start <= ex2->end) && (ex2->start <= ex1->end);
} }
/* check if @ex1 contains @ex2 */ /* check if @ex1 contains @ex2 */
static inline int ldlm_extent_contain(struct ldlm_extent *ex1, static inline int ldlm_extent_contain(const struct ldlm_extent *ex1,
struct ldlm_extent *ex2) const struct ldlm_extent *ex2)
{ {
return (ex1->start <= ex2->start) && (ex1->end >= ex2->end); return (ex1->start <= ex2->start) && (ex1->end >= ex2->end);
} }
...@@ -3092,7 +3092,7 @@ enum agent_req_status { ...@@ -3092,7 +3092,7 @@ enum agent_req_status {
ARS_SUCCEED, ARS_SUCCEED,
}; };
static inline char *agent_req_status2name(enum agent_req_status ars) static inline const char *agent_req_status2name(const enum agent_req_status ars)
{ {
switch (ars) { switch (ars) {
case ARS_WAITING: case ARS_WAITING:
...@@ -3268,7 +3268,7 @@ struct obdo { ...@@ -3268,7 +3268,7 @@ struct obdo {
#define o_cksum o_nlink #define o_cksum o_nlink
#define o_grant_used o_data_version #define o_grant_used o_data_version
static inline void lustre_set_wire_obdo(struct obd_connect_data *ocd, static inline void lustre_set_wire_obdo(const struct obd_connect_data *ocd,
struct obdo *wobdo, struct obdo *wobdo,
const struct obdo *lobdo) const struct obdo *lobdo)
{ {
...@@ -3287,7 +3287,7 @@ static inline void lustre_set_wire_obdo(struct obd_connect_data *ocd, ...@@ -3287,7 +3287,7 @@ static inline void lustre_set_wire_obdo(struct obd_connect_data *ocd,
} }
} }
static inline void lustre_get_wire_obdo(struct obd_connect_data *ocd, static inline void lustre_get_wire_obdo(const struct obd_connect_data *ocd,
struct obdo *lobdo, struct obdo *lobdo,
const struct obdo *wobdo) const struct obdo *wobdo)
{ {
......
...@@ -483,7 +483,7 @@ fid_build_pdo_res_name(const struct lu_fid *fid, unsigned int hash, ...@@ -483,7 +483,7 @@ fid_build_pdo_res_name(const struct lu_fid *fid, unsigned int hash,
* res will be built from normal FID directly, i.e. res[0] = f_seq, * res will be built from normal FID directly, i.e. res[0] = f_seq,
* res[1] = f_oid + f_ver. * res[1] = f_oid + f_ver.
*/ */
static inline void ostid_build_res_name(struct ost_id *oi, static inline void ostid_build_res_name(const struct ost_id *oi,
struct ldlm_res_id *name) struct ldlm_res_id *name)
{ {
memset(name, 0, sizeof(*name)); memset(name, 0, sizeof(*name));
...@@ -498,8 +498,8 @@ static inline void ostid_build_res_name(struct ost_id *oi, ...@@ -498,8 +498,8 @@ static inline void ostid_build_res_name(struct ost_id *oi,
/** /**
* Return true if the resource is for the object identified by this id & group. * Return true if the resource is for the object identified by this id & group.
*/ */
static inline int ostid_res_name_eq(struct ost_id *oi, static inline int ostid_res_name_eq(const struct ost_id *oi,
struct ldlm_res_id *name) const struct ldlm_res_id *name)
{ {
/* Note: it is just a trick here to save some effort, probably the /* Note: it is just a trick here to save some effort, probably the
* correct way would be turn them into the FID and compare * correct way would be turn them into the FID and compare
...@@ -610,7 +610,8 @@ static inline __u32 fid_flatten32(const struct lu_fid *fid) ...@@ -610,7 +610,8 @@ static inline __u32 fid_flatten32(const struct lu_fid *fid)
return ino ? ino : fid_oid(fid); return ino ? ino : fid_oid(fid);
} }
static inline int lu_fid_diff(struct lu_fid *fid1, struct lu_fid *fid2) static inline int lu_fid_diff(const struct lu_fid *fid1,
const struct lu_fid *fid2)
{ {
LASSERTF(fid_seq(fid1) == fid_seq(fid2), "fid1:"DFID", fid2:"DFID"\n", LASSERTF(fid_seq(fid1) == fid_seq(fid2), "fid1:"DFID", fid2:"DFID"\n",
PFID(fid1), PFID(fid2)); PFID(fid1), PFID(fid2));
......
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