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

Commit 8dde0685 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Convert all bare unsigned to unsigned int 



Highlighted by relatively new checkpatch test, warnings like:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b02ac34

drivers/staging/lustre/include/linux/lnet/lnetst.h

+3 −3
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ typedef struct { 
	int		 lstio_ses_timeout;	/* IN: session timeout */

	int		 lstio_ses_force;	/* IN: force create ? */

	/** IN: session features */

	unsigned	 lstio_ses_feats;

	unsigned int	 lstio_ses_feats;

	lst_sid_t __user *lstio_ses_idp;	/* OUT: session id */

	int		 lstio_ses_nmlen;	/* IN: name length */

	char __user	 *lstio_ses_namep;	/* IN: session name */
@@ -255,7 +255,7 @@ typedef struct { 
	lst_sid_t __user	*lstio_ses_idp;		/* OUT: session id */

	int __user		*lstio_ses_keyp;	/* OUT: local key */

	/** OUT: session features */

	unsigned __user		*lstio_ses_featp;

	unsigned int __user	*lstio_ses_featp;

	lstcon_ndlist_ent_t __user *lstio_ses_ndinfo;	/* OUT: */

	int			 lstio_ses_nmlen;	/* IN: name length */

	char __user		*lstio_ses_namep;	/* OUT: session name */
@@ -328,7 +328,7 @@ typedef struct { 
	char __user		*lstio_grp_namep;	/* IN: group name */

	int			 lstio_grp_count;	/* IN: # of nodes */

	/** OUT: session features */

	unsigned __user		*lstio_grp_featp;

	unsigned int __user	*lstio_grp_featp;

	lnet_process_id_t __user *lstio_grp_idsp;	/* IN: nodes */

	struct list_head __user	*lstio_grp_resultp;	/* OUT: list head of

								result buffer */

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

+2 −1
Original line number Diff line number Diff line
@@ -542,7 +542,8 @@ lprocfs_alloc_stats(unsigned int num, enum lprocfs_stats_flags flags); 
void lprocfs_clear_stats(struct lprocfs_stats *stats);

void lprocfs_free_stats(struct lprocfs_stats **stats);

void lprocfs_counter_init(struct lprocfs_stats *stats, int index,

			  unsigned conf, const char *name, const char *units);

			  unsigned int conf, const char *name,

			  const char *units);

struct obd_export;

int lprocfs_exp_cleanup(struct obd_export *exp);

struct dentry *ldebugfs_add_simple(struct dentry *root,

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+4 −4
Original line number Diff line number Diff line
@@ -445,8 +445,8 @@ static struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res) 
	return res;

}



static unsigned ldlm_res_hop_hash(struct cfs_hash *hs,

				  const void *key, unsigned mask)

static unsigned int ldlm_res_hop_hash(struct cfs_hash *hs,

				      const void *key, unsigned int mask)

{

	const struct ldlm_res_id     *id  = key;

	unsigned int		val = 0;
@@ -457,8 +457,8 @@ static unsigned ldlm_res_hop_hash(struct cfs_hash *hs, 
	return val & mask;

}



static unsigned ldlm_res_hop_fid_hash(struct cfs_hash *hs,

				      const void *key, unsigned mask)

static unsigned int ldlm_res_hop_fid_hash(struct cfs_hash *hs,

					  const void *key, unsigned int mask)

{

	const struct ldlm_res_id *id = key;

	struct lu_fid       fid;

drivers/staging/lustre/lustre/llite/llite_nfs.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int ll_encode_fh(struct inode *inode, __u32 *fh, int *plen, 


static int ll_nfs_get_name_filldir(struct dir_context *ctx, const char *name,

				   int namelen, loff_t hash, u64 ino,

				   unsigned type)

				   unsigned int type)

{

	/* It is hack to access lde_fid for comparison with lgd_fid.

	 * So the input 'name' must be part of the 'lu_dirent'.

drivers/staging/lustre/lustre/llite/rw26.c

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static int ll_prepare_partial_page(const struct lu_env *env, struct cl_io *io, 
}



static int ll_write_begin(struct file *file, struct address_space *mapping,

			  loff_t pos, unsigned len, unsigned flags,

			  loff_t pos, unsigned int len, unsigned int flags,

			  struct page **pagep, void **fsdata)

{

	struct ll_cl_context *lcc;
@@ -577,7 +577,7 @@ static int ll_write_end(struct file *file, struct address_space *mapping, 
	struct cl_io *io;

	struct vvp_io *vio;

	struct cl_page *page;

	unsigned from = pos & (PAGE_SIZE - 1);

	unsigned int from = pos & (PAGE_SIZE - 1);

	bool unplug = false;

	int result = 0;