LU-5577 obd: change type of lmv_tgt_desc->ltd_idx to __u32

ltd_idx is used as unsigned.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: Iae119e03b4cb58dddca2ce230d963d380255a57a
Reviewed-on: http://review.whamcloud.com/11879
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index b0d8fc9..e0eca82 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -419,7 +419,7 @@ struct lov_obd {
 struct lmv_tgt_desc {
        struct obd_uuid         ltd_uuid;
        struct obd_export       *ltd_exp;
 struct lmv_tgt_desc {
        struct obd_uuid         ltd_uuid;
        struct obd_export       *ltd_exp;

-       int                     ltd_idx;
+       __u32                   ltd_idx;

        struct mutex            ltd_fid_mutex;
        unsigned long           ltd_active:1; /* target up for requests */
 };
        struct mutex            ltd_fid_mutex;
        unsigned long           ltd_active:1; /* target up for requests */
 };

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index a1499b1..08592bf 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -116,7 +116,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);
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, &req, cb_blocking,
               PFID(&body->mbo_fid1), tgt->ltd_idx);
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, &req, cb_blocking,


@@ -207,7 +207,7 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
                if (IS_ERR(tgt))
                        GOTO(cleanup, rc = PTR_ERR(tgt));
 
                if (IS_ERR(tgt))
                        GOTO(cleanup, rc = PTR_ERR(tgt));
 

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

                       PFID(&fid), tgt->ltd_idx);
 
                if (req != NULL) {
                       PFID(&fid), tgt->ltd_idx);
 
                if (req != NULL) {


@@ -356,7 +356,7 @@ int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
        }
 
        CDEBUG(D_INODE, "OPEN_INTENT with fid1="DFID", fid2="DFID","
        }
 
        CDEBUG(D_INODE, "OPEN_INTENT with fid1="DFID", fid2="DFID","

-              " name='%s' -> mds #%d\n", PFID(&op_data->op_fid1),
+              " name='%s' -> mds #%u\n", PFID(&op_data->op_fid1),

               PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp, cb_blocking,
               PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp, cb_blocking,


@@ -432,7 +432,7 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
                fid_zero(&op_data->op_fid2);
 
        CDEBUG(D_INODE, "LOOKUP_INTENT with fid1="DFID", fid2="DFID
                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",
+              ", name='%s' -> mds #%u lsm=%p lsm_magic=%x\n",

               PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
               op_data->op_name ? op_data->op_name : "<NULL>",
               tgt->ltd_idx, lsm, lsm == NULL ? -1 : lsm->lsm_md_magic);
               PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
               op_data->op_name ? op_data->op_name : "<NULL>",
               tgt->ltd_idx, lsm, lsm == NULL ? -1 : lsm->lsm_md_magic);

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index 7532e97..5279964 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -1963,7 +1963,7 @@ lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
        if (IS_ERR(tgt))
                RETURN(PTR_ERR(tgt));
 
        if (IS_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);
 
        rc = md_enqueue(tgt->ltd_exp, einfo, policy, it, op_data, lockh,
               LL_IT2STR(it), PFID(&op_data->op_fid1), tgt->ltd_idx);
 
        rc = md_enqueue(tgt->ltd_exp, einfo, policy, it, op_data, lockh,


@@ -1992,7 +1992,7 @@ lmv_getattr_name(struct obd_export *exp,struct md_op_data *op_data,
        if (IS_ERR(tgt))
                RETURN(PTR_ERR(tgt));
 
        if (IS_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),
               tgt->ltd_idx);
 
               op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),
               tgt->ltd_idx);
 


@@ -2036,7 +2036,7 @@ lmv_getattr_name(struct obd_export *exp,struct md_op_data *op_data,
 
 static int lmv_early_cancel(struct obd_export *exp, struct lmv_tgt_desc *tgt,
                            struct md_op_data *op_data,
 
 static int lmv_early_cancel(struct obd_export *exp, struct lmv_tgt_desc *tgt,
                            struct md_op_data *op_data,

-                           int op_tgt, ldlm_mode_t mode, int bits, int flag)
+                           __u32 op_tgt, ldlm_mode_t mode, int bits, int flag)

 {
        struct lu_fid          *fid = md_op_data_fid(op_data, flag);
        struct obd_device      *obd = exp->exp_obd;
 {
        struct lu_fid          *fid = md_op_data_fid(op_data, flag);
        struct obd_device      *obd = exp->exp_obd;


@@ -2731,7 +2731,7 @@ try_next_stripe:
        if (rc != 0)
                RETURN(rc);
 
        if (rc != 0)
                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);
 
        rc = md_unlink(tgt->ltd_exp, op_data, request);
               PFID(&op_data->op_fid1), PFID(&op_data->op_fid2), tgt->ltd_idx);
 
        rc = md_unlink(tgt->ltd_exp, op_data, request);

diff --git a/lustre/lmv/lproc_lmv.c b/lustre/lmv/lproc_lmv.c
index 5a7271a..de2a6f3 100644 (file)
--- a/lustre/lmv/lproc_lmv.c
+++ b/lustre/lmv/lproc_lmv.c
@@ -175,7 +175,7 @@ static int lmv_tgt_seq_show(struct seq_file *p, void *v)
 
        if (tgt == NULL)
                return 0;
 
        if (tgt == NULL)
                return 0;

-       return seq_printf(p, "%d: %s %sACTIVE\n", tgt->ltd_idx,
+       return seq_printf(p, "%u: %s %sACTIVE\n", tgt->ltd_idx,

                          tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
 }
 
                          tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN");
 }