LU-9753 ofd: 64-bits diff variable to avoid overflow

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 31c17f9..2476f9e 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -237,13 +237,14 @@ static void ofd_stack_fini(const struct lu_env *env, struct ofd_device *m,
        if (obd->obd_fail)
                strcat(flags, "A");
        lustre_cfg_bufs_set_string(&bufs, 1, flags);
-       lcfg = lustre_cfg_new(LCFG_CLEANUP, &bufs);
-       if (lcfg == NULL)
+       OBD_ALLOC(lcfg, lustre_cfg_len(bufs.lcfg_bufcount, bufs.lcfg_buflen));
+       if (!lcfg)
                RETURN_EXIT;
+       lustre_cfg_init(lcfg, LCFG_CLEANUP, &bufs);
 
        LASSERT(top);
        top->ld_ops->ldo_process_config(env, top, lcfg);
-       lustre_cfg_free(lcfg);
+       OBD_FREE(lcfg, lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens));
 
        lu_site_purge(env, top->ld_site, ~0);
        if (!cfs_hash_is_empty(top->ld_site->ls_obj_hash)) {
@@ -1558,7 +1559,8 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
        u64                      seq = ostid_seq(&oa->o_oi);
        u64                      oid = ostid_id(&oa->o_oi);
        struct ofd_seq          *oseq;
-       int                      rc = 0, diff;
+       s64 diff;
+       int rc = 0;
        int                      sync_trans = 0;
        long                     granted = 0;
 
@@ -1628,9 +1630,16 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                        GOTO(out, rc);
                }
                diff = oid - ofd_seq_last_oid(oseq);
-               CDEBUG(D_HA, "ofd_last_id() = %llu -> diff = %d\n",
-                       ofd_seq_last_oid(oseq), diff);
+               CDEBUG(D_HA, "ofd_last_id() = %llu -> diff = %lld\n",
+                      ofd_seq_last_oid(oseq), diff);
                if (-diff > OST_MAX_PRECREATE) {
+                       LCONSOLE(D_INFO, "%s: too large difference between MDS "
+                                "LAST_ID "DFID" (%llu) and OST LAST_ID "DFID" "
+                                "(%llu), trust the OST\n",
+                                ofd_name(ofd), PFID(&oa->o_oi.oi_fid), oid,
+                                PFID(&oseq->os_oi.oi_fid),
+                                ofd_seq_last_oid(oseq));
+
                        /* Let MDS know that we are so far ahead. */
                        rc = ostid_set_id(&rep_oa->o_oi,
                                          ofd_seq_last_oid(oseq) + 1);
@@ -1705,7 +1714,7 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                                rc = granted;
                                granted = 0;
                                CDEBUG(D_HA, "%s: failed to acquire grant "
-                                      "space for precreate (%d): rc = %d\n",
+                                      "space for precreate (%lld): rc = %d\n",
                                       ofd_name(ofd), diff, rc);
                                diff = 0;
                        }
@@ -1725,7 +1734,7 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
 
                        CDEBUG(D_HA, "%s: precreate FID "DOSTID" is over "
                               "%u larger than the LAST_ID "DOSTID", only "
-                              "precreating the last %u objects.\n",
+                              "precreating the last %lld objects.\n",
                               ofd_name(ofd), POSTID(&oa->o_oi),
                               5 * OST_MAX_PRECREATE,
                               POSTID(&oseq->os_oi), diff);
@@ -1734,7 +1743,7 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
 
                while (diff > 0) {
                        next_id = ofd_seq_last_oid(oseq) + 1;
-                       count = ofd_precreate_batch(ofd, diff);
+                       count = ofd_precreate_batch(ofd, (int)diff);
 
                        CDEBUG(D_HA, "%s: reserve %d objects in group %#llx"
                               " at %llu\n", ofd_name(ofd),
@@ -1742,7 +1751,7 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
 
                        if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
                            && cfs_time_after(jiffies, enough_time)) {
-                               CDEBUG(D_HA, "%s: Slow creates, %d/%d objects"
+                               CDEBUG(D_HA, "%s: Slow creates, %d/%lld objects"
                                      " created at a rate of %d/s\n",
                                      ofd_name(ofd), created, diff + created,
                                      created / DISK_TIMEOUT);
@@ -1763,7 +1772,7 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                    lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
                        LCONSOLE_WARN("%s: can't create the same count of"
                                      " objects when replaying the request"
-                                     " (diff is %d). see LU-4621\n",
+                                     " (diff is %lld). see LU-4621\n",
                                      ofd_name(ofd), diff);
 
                if (created > 0)
@@ -3018,10 +3027,10 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        }
        tgd->tgd_blockbits = fls(osfs->os_bsize) - 1;
 
-       if (ONE_MB_BRW_SIZE < (1U << tgd->tgd_blockbits))
+       if (DT_DEF_BRW_SIZE < (1U << tgd->tgd_blockbits))
                m->ofd_brw_size = 1U << tgd->tgd_blockbits;
        else
-               m->ofd_brw_size = ONE_MB_BRW_SIZE;
+               m->ofd_brw_size = DT_DEF_BRW_SIZE;
 
        m->ofd_cksum_types_supported = cksum_types_supported_server();
        m->ofd_precreate_batch = OFD_PRECREATE_BATCH_DEFAULT;