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

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



Change type of client_obd->*_mds_*size from int to __u32 and
argumanets of related create/rename/setattr functions.
Change type of op_data->op_namelen to size_t.
Change type of argument size for all mdc_*_pack() to size_t.

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/11379


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 60873bb8

drivers/staging/lustre/lustre/include/obd.h

+12 −11
Original line number Diff line number Diff line
@@ -220,10 +220,10 @@ struct client_obd { 
	/* max_mds_easize is purely a performance thing so we don't have to

	 * call obd_size_diskmd() all the time.

	 */

	int			 cl_default_mds_easize;

	int			 cl_max_mds_easize;

	int			 cl_default_mds_cookiesize;

	int			 cl_max_mds_cookiesize;

	u32			 cl_default_mds_easize;

	u32			 cl_max_mds_easize;

	u32			 cl_default_mds_cookiesize;

	u32			 cl_max_mds_cookiesize;



	enum lustre_sec_part     cl_sp_me;

	enum lustre_sec_part     cl_sp_to;
@@ -745,7 +745,7 @@ struct md_op_data { 
	struct lustre_handle    op_handle;

	s64			op_mod_time;

	const char	     *op_name;

	int		     op_namelen;

	size_t			op_namelen;

	__u32		   op_mode;

	struct lmv_stripe_md   *op_mea1;

	struct lmv_stripe_md   *op_mea2;
@@ -976,8 +976,8 @@ struct md_ops { 
	int (*close)(struct obd_export *, struct md_op_data *,

		     struct md_open_data *, struct ptlrpc_request **);

	int (*create)(struct obd_export *, struct md_op_data *,

		      const void *, int, int, __u32, __u32, cfs_cap_t,

		      __u64, struct ptlrpc_request **);

		      const void *, size_t, umode_t, uid_t, gid_t,

		      cfs_cap_t, __u64, struct ptlrpc_request **);

	int (*done_writing)(struct obd_export *, struct md_op_data  *,

			    struct md_open_data *);

	int (*enqueue)(struct obd_export *, struct ldlm_enqueue_info *,
@@ -995,10 +995,10 @@ struct md_ops { 
	int (*link)(struct obd_export *, struct md_op_data *,

		    struct ptlrpc_request **);

	int (*rename)(struct obd_export *, struct md_op_data *,

		      const char *, int, const char *, int,

		      const char *, size_t, const char *, size_t,

		      struct ptlrpc_request **);

	int (*setattr)(struct obd_export *, struct md_op_data *, void *,

		       int, void *, int, struct ptlrpc_request **,

		       size_t, void *, size_t, struct ptlrpc_request **,

			 struct md_open_data **mod);

	int (*sync)(struct obd_export *, const struct lu_fid *,

		    struct ptlrpc_request **);
@@ -1016,7 +1016,7 @@ struct md_ops { 
			u64, const char *, const char *, int, int, int,

			struct ptlrpc_request **);



	int (*init_ea_size)(struct obd_export *, int, int, int, int);

	int (*init_ea_size)(struct obd_export *, u32, u32, u32, u32);



	int (*get_lustre_md)(struct obd_export *, struct ptlrpc_request *,

			     struct obd_export *, struct obd_export *,
@@ -1139,7 +1139,8 @@ static inline const char *lu_dev_name(const struct lu_device *lu_dev) 
	return lu_dev->ld_obd->obd_name;

}



static inline bool filename_is_volatile(const char *name, int namelen, int *idx)

static inline bool filename_is_volatile(const char *name, size_t namelen,

					int *idx)

{

	const char	*start;

	char		*end;

drivers/staging/lustre/lustre/include/obd_class.h

+6 −6
Original line number Diff line number Diff line
@@ -1358,9 +1358,9 @@ static inline int md_close(struct obd_export *exp, struct md_op_data *op_data, 
}



static inline int md_create(struct obd_export *exp, struct md_op_data *op_data,

			    const void *data, int datalen, int mode, __u32 uid,

			    __u32 gid, cfs_cap_t cap_effective, __u64 rdev,

			    struct ptlrpc_request **request)

			    const void *data, size_t datalen, umode_t mode,

			    uid_t uid, gid_t gid, cfs_cap_t cap_effective,

			    __u64 rdev, struct ptlrpc_request **request)

{

	int rc;
@@ -1440,8 +1440,8 @@ static inline int md_link(struct obd_export *exp, struct md_op_data *op_data, 
}



static inline int md_rename(struct obd_export *exp, struct md_op_data *op_data,

			    const char *old, int oldlen, const char *new,

			    int newlen, struct ptlrpc_request **request)

			    const char *old, size_t oldlen, const char *new,

			    size_t newlen, struct ptlrpc_request **request)

{

	int rc;
@@ -1453,7 +1453,7 @@ static inline int md_rename(struct obd_export *exp, struct md_op_data *op_data, 
}



static inline int md_setattr(struct obd_export *exp, struct md_op_data *op_data,

			     void *ea, int ealen, void *ea2, int ea2len,

			     void *ea, size_t ealen, void *ea2, size_t ea2len,

			     struct ptlrpc_request **request,

			     struct md_open_data **mod)

{

drivers/staging/lustre/lustre/llite/llite_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -868,8 +868,8 @@ enum { 


struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data,

				      struct inode *i1, struct inode *i2,

				      const char *name, int namelen,

				      int mode, __u32 opc, void *data);

				      const char *name, size_t namelen,

				      u32 mode, __u32 opc, void *data);

void ll_finish_md_op_data(struct md_op_data *op_data);

int ll_get_obd_name(struct inode *inode, unsigned int cmd, unsigned long arg);

char *ll_get_fsname(struct super_block *sb, char *buf, int buflen);

drivers/staging/lustre/lustre/llite/llite_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -2324,8 +2324,8 @@ int ll_process_config(struct lustre_cfg *lcfg) 
/* this function prepares md_op_data hint for passing ot down to MD stack. */

struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data,

				      struct inode *i1, struct inode *i2,

				      const char *name, int namelen,

				      int mode, __u32 opc, void *data)

				      const char *name, size_t namelen,

				      u32 mode, __u32 opc, void *data)

{

	if (!name) {

		/* Do not reuse namelen for something else. */

drivers/staging/lustre/lustre/lmv/lmv_intent.c

+3 −2
Original line number Diff line number Diff line
@@ -520,8 +520,9 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data, 
	LASSERT(fid_is_sane(&op_data->op_fid1));



	CDEBUG(D_INODE, "INTENT LOCK '%s' for "DFID" '%*s' on "DFID"\n",

	       LL_IT2STR(it), PFID(&op_data->op_fid2), op_data->op_namelen,

	       op_data->op_name, PFID(&op_data->op_fid1));

	       LL_IT2STR(it), PFID(&op_data->op_fid2),

	       (int)op_data->op_namelen, op_data->op_name,

	       PFID(&op_data->op_fid1));



	rc = lmv_check_connect(obd);

	if (rc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE