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

Commit 97cba130 authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging: lustre: fix comparison between signed and unsigned 



Cleanup in general headers.
* use size_t in cfs_size_round*()
* make unsigned index and len in lustre_cfg_*()
* make iteration variable the same type as comparing value
* make unsigned pages counters

Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5417
Reviewed-on: http://review.whamcloud.com/11327


Reviewed-by: default avatarJohn L. Hammond <john.hammond@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 058a6a42

drivers/staging/lustre/include/linux/libcfs/libcfs_private.h

+6 −6
Original line number Diff line number Diff line
@@ -310,13 +310,13 @@ do { \ 


#define MKSTR(ptr) ((ptr)) ? (ptr) : ""



static inline int cfs_size_round4(int val)

static inline size_t cfs_size_round4(int val)

{

	return (val + 3) & (~0x3);

}



#ifndef HAVE_CFS_SIZE_ROUND

static inline int cfs_size_round(int val)

static inline size_t cfs_size_round(int val)

{

	return (val + 7) & (~0x7);

}
@@ -324,17 +324,17 @@ static inline int cfs_size_round(int val) 
#define HAVE_CFS_SIZE_ROUND

#endif



static inline int cfs_size_round16(int val)

static inline size_t cfs_size_round16(int val)

{

	return (val + 0xf) & (~0xf);

}



static inline int cfs_size_round32(int val)

static inline size_t cfs_size_round32(int val)

{

	return (val + 0x1f) & (~0x1f);

}



static inline int cfs_size_round0(int val)

static inline size_t cfs_size_round0(int val)

{

	if (!val)

		return 0;
@@ -343,7 +343,7 @@ static inline int cfs_size_round0(int val) 


static inline size_t cfs_round_strlen(char *fset)

{

	return (size_t)cfs_size_round((int)strlen(fset) + 1);

	return cfs_size_round((int)strlen(fset) + 1);

}



#define LOGL(var, len, ptr)				       \

drivers/staging/lustre/lustre/include/lprocfs_status.h

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static inline __u64 lprocfs_stats_collector(struct lprocfs_stats *stats, 
					    int idx,

					    enum lprocfs_fields_flags field)

{

	int	      i;

	unsigned int i;

	unsigned int  num_cpu;

	unsigned long flags	= 0;

	__u64	      ret	= 0;

drivers/staging/lustre/lustre/include/lustre_cfg.h

+12 −14
Original line number Diff line number Diff line
@@ -151,13 +151,11 @@ static inline void lustre_cfg_bufs_reset(struct lustre_cfg_bufs *bufs, char *nam 
		lustre_cfg_bufs_set_string(bufs, 0, name);

}



static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg, int index)

static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg, __u32 index)

{

	int i;

	int offset;

	int bufcount;



	LASSERT(index >= 0);

	__u32 i;

	size_t offset;

	__u32 bufcount;



	bufcount = lcfg->lcfg_bufcount;

	if (index >= bufcount)
@@ -172,7 +170,7 @@ static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg, int index) 
static inline void lustre_cfg_bufs_init(struct lustre_cfg_bufs *bufs,

					struct lustre_cfg *lcfg)

{

	int i;

	__u32 i;



	bufs->lcfg_bufcount = lcfg->lcfg_bufcount;

	for (i = 0; i < bufs->lcfg_bufcount; i++) {
@@ -181,7 +179,7 @@ static inline void lustre_cfg_bufs_init(struct lustre_cfg_bufs *bufs, 
	}

}



static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index)

static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, __u32 index)

{

	char *s;
@@ -197,7 +195,7 @@ static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index) 
	 * of data.  Try to use the padding first though.

	 */

	if (s[lcfg->lcfg_buflens[index] - 1] != '\0') {

		int last = min((int)lcfg->lcfg_buflens[index],

		size_t last = min((size_t)lcfg->lcfg_buflens[index],

				  cfs_size_round(lcfg->lcfg_buflens[index]) - 1);

		char lost = s[last];
@@ -210,10 +208,10 @@ static inline char *lustre_cfg_string(struct lustre_cfg *lcfg, int index) 
	return s;

}



static inline int lustre_cfg_len(__u32 bufcount, __u32 *buflens)

static inline __u32 lustre_cfg_len(__u32 bufcount, __u32 *buflens)

{

	int i;

	int len;

	__u32 i;

	__u32 len;



	len = LCFG_HDR_SIZE(bufcount);

	for (i = 0; i < bufcount; i++)
@@ -254,7 +252,7 @@ static inline void lustre_cfg_free(struct lustre_cfg *lcfg) 
	return;

}



static inline int lustre_cfg_sanity_check(void *buf, int len)

static inline int lustre_cfg_sanity_check(void *buf, size_t len)

{

	struct lustre_cfg *lcfg = (struct lustre_cfg *)buf;

drivers/staging/lustre/lustre/include/lustre_lmv.h

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct lmv_stripe_md { 
static inline bool

lsm_md_eq(const struct lmv_stripe_md *lsm1, const struct lmv_stripe_md *lsm2)

{

	int idx;

	__u32 idx;



	if (lsm1->lsm_md_magic != lsm2->lsm_md_magic ||

	    lsm1->lsm_md_stripe_count != lsm2->lsm_md_stripe_count ||
@@ -92,7 +92,7 @@ static inline void lmv_free_memmd(struct lmv_stripe_md *lsm) 
static inline void lmv1_le_to_cpu(struct lmv_mds_md_v1 *lmv_dst,

				  const struct lmv_mds_md_v1 *lmv_src)

{

	int i;

	__u32 i;



	lmv_dst->lmv_magic = le32_to_cpu(lmv_src->lmv_magic);

	lmv_dst->lmv_stripe_count = le32_to_cpu(lmv_src->lmv_stripe_count);

drivers/staging/lustre/lustre/include/lustre_net.h

+6 −4
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ static inline bool ptlrpc_nrs_req_can_move(struct ptlrpc_request *req) 
/**

 * Returns 1 if request buffer at offset \a index was already swabbed

 */

static inline int lustre_req_swabbed(struct ptlrpc_request *req, int index)

static inline int lustre_req_swabbed(struct ptlrpc_request *req, size_t index)

{

	LASSERT(index < sizeof(req->rq_req_swab_mask) * 8);

	return req->rq_req_swab_mask & (1 << index);
@@ -1640,7 +1640,7 @@ static inline int lustre_req_swabbed(struct ptlrpc_request *req, int index) 
/**

 * Returns 1 if request reply buffer at offset \a index was already swabbed

 */

static inline int lustre_rep_swabbed(struct ptlrpc_request *req, int index)

static inline int lustre_rep_swabbed(struct ptlrpc_request *req, size_t index)

{

	LASSERT(index < sizeof(req->rq_rep_swab_mask) * 8);

	return req->rq_rep_swab_mask & (1 << index);
@@ -1665,7 +1665,8 @@ static inline int ptlrpc_rep_need_swab(struct ptlrpc_request *req) 
/**

 * Mark request buffer at offset \a index that it was already swabbed

 */

static inline void lustre_set_req_swabbed(struct ptlrpc_request *req, int index)

static inline void lustre_set_req_swabbed(struct ptlrpc_request *req,

					  size_t index)

{

	LASSERT(index < sizeof(req->rq_req_swab_mask) * 8);

	LASSERT((req->rq_req_swab_mask & (1 << index)) == 0);
@@ -1675,7 +1676,8 @@ static inline void lustre_set_req_swabbed(struct ptlrpc_request *req, int index) 
/**

 * Mark request reply buffer at offset \a index that it was already swabbed

 */

static inline void lustre_set_rep_swabbed(struct ptlrpc_request *req, int index)

static inline void lustre_set_rep_swabbed(struct ptlrpc_request *req,

					  size_t index)

{

	LASSERT(index < sizeof(req->rq_rep_swab_mask) * 8);

	LASSERT((req->rq_rep_swab_mask & (1 << index)) == 0);