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

Commit b69835a2 authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre: fix build warnning on 32bit system 



Building on 32bit system, I got warnings like below:
drivers/staging/lustre/lustre/llite/../include/lprocfs_status.h:666:7: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’
 char *lprocfs_find_named_value(const char *buffer, const char *name,

drivers/staging/lustre/lustre/lov/lov_io.c: In function ‘lov_io_rw_iter_init’:
include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
  (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \

Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d4450c4

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

+2 −2
Original line number Diff line number Diff line
@@ -663,8 +663,8 @@ extern int lprocfs_write_u64_helper(const char *buffer, unsigned long count, 
extern int lprocfs_write_frac_u64_helper(const char *buffer,

					 unsigned long count,

					 __u64 *val, int mult);

char *lprocfs_find_named_value(const char *buffer, const char *name,

				unsigned long *count);

extern char *lprocfs_find_named_value(const char *buffer, const char *name,

				      size_t *count);

void lprocfs_oh_tally(struct obd_histogram *oh, unsigned int value);

void lprocfs_oh_tally_log2(struct obd_histogram *oh, unsigned int value);

void lprocfs_oh_clear(struct obd_histogram *oh);

drivers/staging/lustre/lustre/lov/lov_io.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int lov_io_rw_iter_init(const struct lu_env *env, 
	struct lov_io	*lio = cl2lov_io(env, ios);

	struct cl_io	 *io  = ios->cis_io;

	struct lov_stripe_md *lsm = lio->lis_object->lo_lsm;

	loff_t start = io->u.ci_rw.crw_pos;

	__u64 start = io->u.ci_rw.crw_pos;

	loff_t next;

	unsigned long ssize = lsm->lsm_stripe_size;

drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

+1 −1
Original line number Diff line number Diff line
@@ -1873,7 +1873,7 @@ static char *lprocfs_strnstr(const char *s1, const char *s2, size_t len) 
 * If \a name is not found the original \a buffer is returned.

 */

char *lprocfs_find_named_value(const char *buffer, const char *name,

				unsigned long *count)

			       size_t *count)

{

	char *val;

	size_t buflen = *count;