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

staging: lustre: obd: change type of lmv_tgt_desc->ltd_idx to u32 



ltd_idx is used as unsigned.

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


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 960a7e37

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -406,7 +406,7 @@ struct lov_obd { 
struct lmv_tgt_desc {

struct lmv_tgt_desc {

	struct obd_uuid		ltd_uuid;

	struct obd_uuid		ltd_uuid;

	struct obd_export	*ltd_exp;

	struct obd_export	*ltd_exp;

	int			ltd_idx;

	u32			ltd_idx;

	struct mutex		ltd_fid_mutex;

	struct mutex		ltd_fid_mutex;

	unsigned long		ltd_active:1; /* target up for requests */

	unsigned long		ltd_active:1; /* target up for requests */

};

};

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it, 
	}

	}





	op_data->op_bias = MDS_CROSS_REF;

	op_data->op_bias = MDS_CROSS_REF;

	CDEBUG(D_INODE, "REMOTE_INTENT with fid="DFID" -> mds #%d\n",

	CDEBUG(D_INODE, "REMOTE_INTENT with fid=" DFID " -> mds #%u\n",

	       PFID(&body->mbo_fid1), tgt->ltd_idx);

	       PFID(&body->mbo_fid1), tgt->ltd_idx);





	rc = md_intent_lock(tgt->ltd_exp, op_data, it, &req, cb_blocking,

	rc = md_intent_lock(tgt->ltd_exp, op_data, it, &req, cb_blocking,
@@ -202,7 +202,7 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody, 
			goto cleanup;

			goto cleanup;

		}

		}





		CDEBUG(D_INODE, "Revalidate slave "DFID" -> mds #%d\n",

		CDEBUG(D_INODE, "Revalidate slave " DFID " -> mds #%u\n",

		       PFID(&fid), tgt->ltd_idx);

		       PFID(&fid), tgt->ltd_idx);





		if (req) {

		if (req) {
@@ -349,7 +349,7 @@ static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data, 
			return rc;

			return rc;

	}

	}





	CDEBUG(D_INODE, "OPEN_INTENT with fid1=" DFID ", fid2=" DFID ", name='%s' -> mds #%d\n",

	CDEBUG(D_INODE, "OPEN_INTENT with fid1=" DFID ", fid2=" DFID ", name='%s' -> mds #%u\n",

	       PFID(&op_data->op_fid1),

	       PFID(&op_data->op_fid1),

	       PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);

	       PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);
@@ -427,7 +427,7 @@ static int lmv_intent_lookup(struct obd_export *exp, 
	if (!fid_is_sane(&op_data->op_fid2))

	if (!fid_is_sane(&op_data->op_fid2))

		fid_zero(&op_data->op_fid2);

		fid_zero(&op_data->op_fid2);





	CDEBUG(D_INODE, "LOOKUP_INTENT with fid1="DFID", fid2="DFID", name='%s' -> mds #%d lsm=%p lsm_magic=%x\n",

	CDEBUG(D_INODE, "LOOKUP_INTENT with fid1=" DFID ", fid2=" DFID ", name='%s' -> mds #%u lsm=%p lsm_magic=%x\n",

	       PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),

	       PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),

	       op_data->op_name ? op_data->op_name : "<NULL>",

	       op_data->op_name ? op_data->op_name : "<NULL>",

	       tgt->ltd_idx, lsm, !lsm ? -1 : lsm->lsm_md_magic);

	       tgt->ltd_idx, lsm, !lsm ? -1 : lsm->lsm_md_magic);

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1834,7 +1834,7 @@ lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, 
	if (IS_ERR(tgt))

	if (IS_ERR(tgt))

		return PTR_ERR(tgt);

		return PTR_ERR(tgt);





	CDEBUG(D_INODE, "ENQUEUE '%s' on "DFID" -> mds #%d\n",

	CDEBUG(D_INODE, "ENQUEUE '%s' on " DFID " -> mds #%u\n",

	       LL_IT2STR(it), PFID(&op_data->op_fid1), tgt->ltd_idx);

	       LL_IT2STR(it), PFID(&op_data->op_fid1), tgt->ltd_idx);





	rc = md_enqueue(tgt->ltd_exp, einfo, policy, it, op_data, lockh,

	rc = md_enqueue(tgt->ltd_exp, einfo, policy, it, op_data, lockh,
@@ -1862,7 +1862,7 @@ lmv_getattr_name(struct obd_export *exp, struct md_op_data *op_data, 
	if (IS_ERR(tgt))

	if (IS_ERR(tgt))

		return PTR_ERR(tgt);

		return PTR_ERR(tgt);





	CDEBUG(D_INODE, "GETATTR_NAME for %*s on "DFID" -> mds #%d\n",

	CDEBUG(D_INODE, "GETATTR_NAME for %*s on " DFID " -> mds #%u\n",

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

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

	       tgt->ltd_idx);

	       tgt->ltd_idx);
@@ -2607,7 +2607,7 @@ static int lmv_unlink(struct obd_export *exp, struct md_op_data *op_data, 
	if (rc != 0)

	if (rc != 0)

		return rc;

		return rc;





	CDEBUG(D_INODE, "unlink with fid="DFID"/"DFID" -> mds #%d\n",

	CDEBUG(D_INODE, "unlink with fid=" DFID "/" DFID " -> mds #%u\n",

	       PFID(&op_data->op_fid1), PFID(&op_data->op_fid2), tgt->ltd_idx);

	       PFID(&op_data->op_fid1), PFID(&op_data->op_fid2), tgt->ltd_idx);





	rc = md_unlink(tgt->ltd_exp, op_data, request);

	rc = md_unlink(tgt->ltd_exp, op_data, request);

drivers/staging/lustre/lustre/lmv/lproc_lmv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ static int lmv_tgt_seq_show(struct seq_file *p, void *v) 




	if (!tgt)

	if (!tgt)

		return 0;

		return 0;

	seq_printf(p, "%d: %s %sACTIVE\n",

	seq_printf(p, "%u: %s %sACTIVE\n",

		   tgt->ltd_idx, tgt->ltd_uuid.uuid,

		   tgt->ltd_idx, tgt->ltd_uuid.uuid,

		   tgt->ltd_active ? "" : "IN");

		   tgt->ltd_active ? "" : "IN");

	return 0;

	return 0;