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

staging: lustre: changelog: fix comparison between signed and unsigned 



Change type of changelog_*{namelen,size}() to size_t.
Fixed string specifier for unsigned types.

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


Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Nunez <james.a.nunez@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee553243

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+5 −5
Original line number Diff line number Diff line
@@ -819,9 +819,9 @@ struct changelog_ext_jobid { 
	char	cr_jobid[LUSTRE_JOBID_SIZE];	/**< zero-terminated string. */

};



static inline unsigned int changelog_rec_offset(enum changelog_rec_flags crf)

static inline size_t changelog_rec_offset(enum changelog_rec_flags crf)

{

	unsigned int size = sizeof(struct changelog_rec);

	size_t size = sizeof(struct changelog_rec);



	if (crf & CLF_RENAME)

		size += sizeof(struct changelog_ext_rename);
@@ -832,12 +832,12 @@ static inline unsigned int changelog_rec_offset(enum changelog_rec_flags crf) 
	return size;

}



static inline int changelog_rec_size(struct changelog_rec *rec)

static inline size_t changelog_rec_size(struct changelog_rec *rec)

{

	return changelog_rec_offset(rec->cr_flags);

}



static inline unsigned int changelog_rec_varsize(struct changelog_rec *rec)

static inline size_t changelog_rec_varsize(struct changelog_rec *rec)

{

	return changelog_rec_size(rec) - sizeof(*rec) + rec->cr_namelen;

}
@@ -869,7 +869,7 @@ static inline char *changelog_rec_name(struct changelog_rec *rec) 
						  CLF_SUPPORTED);

}



static inline int changelog_rec_snamelen(struct changelog_rec *rec)

static inline size_t changelog_rec_snamelen(struct changelog_rec *rec)

{

	return rec->cr_namelen - strlen(changelog_rec_name(rec)) - 1;

}

drivers/staging/lustre/lustre/llite/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1129,7 +1129,7 @@ ll_file_io_generic(const struct lu_env *env, struct vvp_io_args *args, 
	struct cl_io	 *io;

	ssize_t	       result;



	CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zd\n",

	CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zu\n",

	       file->f_path.dentry->d_name.name, iot, *ppos, count);



restart:
@@ -1207,7 +1207,7 @@ out: 
	 * short read/write instead of restart io.

	 */

	if ((result == 0 || result == -ENODATA) && io->ci_need_restart) {

		CDEBUG(D_VFSTRACE, "Restart %s on %pD from %lld, count:%zd\n",

		CDEBUG(D_VFSTRACE, "Restart %s on %pD from %lld, count:%zu\n",

		       iot == CIT_READ ? "read" : "write",

		       file, *ppos, count);

		LASSERTF(io->ci_nob == 0, "%zd\n", io->ci_nob);

CRA Git | Maintained and supported by SUSTech CRA and CCSE