LU-3107 build: fix 'code maintainability' errors

[fs/lustre-release.git] / lustre / obdclass / llog_cat.c

diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c
index ced4c76..c8c83e4 100644 (file)
--- a/lustre/obdclass/llog_cat.c
+++ b/lustre/obdclass/llog_cat.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -118,9 +118,10 @@ static int llog_cat_new_log(const struct lu_env *env,
         cathandle->lgh_last_idx = index;
         llh->llh_tail.lrt_index = index;
 
-        CDEBUG(D_RPCTRACE,"new recovery log "LPX64":%x for index %u of catalog "
-               LPX64"\n", loghandle->lgh_id.lgl_oid, loghandle->lgh_id.lgl_ogen,
-               index, cathandle->lgh_id.lgl_oid);
+       CDEBUG(D_RPCTRACE,"new recovery log "DOSTID":%x for index %u of catalog"
+              DOSTID"\n", POSTID(&loghandle->lgh_id.lgl_oi),
+              loghandle->lgh_id.lgl_ogen, index,
+              POSTID(&cathandle->lgh_id.lgl_oi));
         /* build the record for this log in the catalog */
         rec.lid_hdr.lrh_len = sizeof(rec);
         rec.lid_hdr.lrh_index = index;
@@ -167,11 +168,12 @@ int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
                                u.phd.phd_entry) {
                struct llog_logid *cgl = &loghandle->lgh_id;
 
-               if (cgl->lgl_oid == logid->lgl_oid) {
+               if (ostid_id(&cgl->lgl_oi) == ostid_id(&logid->lgl_oi) &&
+                   ostid_seq(&cgl->lgl_oi) == ostid_seq(&logid->lgl_oi)) {
                        if (cgl->lgl_ogen != logid->lgl_ogen) {
-                               CERROR("%s: log "LPX64" generation %x != %x\n",
+                               CERROR("%s: log "DOSTID" generation %x != %x\n",
                                       loghandle->lgh_ctxt->loc_obd->obd_name,
-                                      logid->lgl_oid, cgl->lgl_ogen,
+                                      POSTID(&logid->lgl_oi), cgl->lgl_ogen,
                                       logid->lgl_ogen);
                                continue;
                        }
@@ -185,9 +187,9 @@ int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
        rc = llog_open(env, cathandle->lgh_ctxt, &loghandle, logid, NULL,
                       LLOG_OPEN_EXISTS);
        if (rc < 0) {
-               CERROR("%s: error opening log id "LPX64":%x: rc = %d\n",
+               CERROR("%s: error opening log id "DOSTID":%x: rc = %d\n",
                       cathandle->lgh_ctxt->loc_obd->obd_name,
-                      logid->lgl_oid, logid->lgl_ogen, rc);
+                      POSTID(&logid->lgl_oi), logid->lgl_ogen, rc);
                RETURN(rc);
        }
 
@@ -508,9 +510,9 @@ int llog_cat_cancel_records(const struct lu_env *env,
 
                rc = llog_cat_id2handle(env, cathandle, &loghandle, lgl);
                if (rc) {
-                       CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+                       CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
                               cathandle->lgh_ctxt->loc_obd->obd_name,
-                              lgl->lgl_oid, rc);
+                              POSTID(&lgl->lgl_oi), rc);
                        failed++;
                        continue;
                }
@@ -551,15 +553,15 @@ int llog_cat_process_cb(const struct lu_env *env, struct llog_handle *cat_llh,
                 CERROR("invalid record in catalog\n");
                 RETURN(-EINVAL);
         }
-        CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog "
-               LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
-               rec->lrh_index, cat_llh->lgh_id.lgl_oid);
+       CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
+              DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
+              rec->lrh_index, POSTID(&cat_llh->lgh_id.lgl_oi));
 
        rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
        if (rc) {
-               CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+               CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
                       cat_llh->lgh_ctxt->loc_obd->obd_name,
-                      lir->lid_id.lgl_oid, rc);
+                      POSTID(&lir->lid_id.lgl_oi), rc);
                RETURN(rc);
        }
 
@@ -604,8 +606,8 @@ int llog_cat_process_or_fork(const struct lu_env *env,
         if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
                 struct llog_process_cat_data cd;
 
-                CWARN("catlog "LPX64" crosses index zero\n",
-                      cat_llh->lgh_id.lgl_oid);
+                CWARN("catlog "DOSTID" crosses index zero\n",
+                      POSTID(&cat_llh->lgh_id.lgl_oi));
 
                 cd.lpcd_first_idx = llh->llh_cat_idx;
                 cd.lpcd_last_idx = 0;
@@ -639,24 +641,24 @@ static int llog_cat_reverse_process_cb(const struct lu_env *env,
                                       struct llog_handle *cat_llh,
                                       struct llog_rec_hdr *rec, void *data)
 {
-        struct llog_process_data *d = data;
-        struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
-        struct llog_handle *llh;
-        int rc;
+       struct llog_process_data *d = data;
+       struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
+       struct llog_handle *llh;
+       int rc;
 
-        if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) {
-                CERROR("invalid record in catalog\n");
-                RETURN(-EINVAL);
-        }
-        CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog "
-               LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
-               le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
+       if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) {
+               CERROR("invalid record in catalog\n");
+               RETURN(-EINVAL);
+       }
+       CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
+              DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
+              le32_to_cpu(rec->lrh_index), POSTID(&cat_llh->lgh_id.lgl_oi));
 
        rc = llog_cat_id2handle(env, cat_llh, &llh, &lir->lid_id);
        if (rc) {
-               CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+               CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
                       cat_llh->lgh_ctxt->loc_obd->obd_name,
-                      lir->lid_id.lgl_oid, rc);
+                      POSTID(&lir->lid_id.lgl_oi), rc);
                RETURN(rc);
        }
 
@@ -679,9 +681,9 @@ int llog_cat_reverse_process(const struct lu_env *env,
         d.lpd_data = data;
         d.lpd_cb = cb;
 
-        if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
-                CWARN("catalog "LPX64" crosses index zero\n",
-                      cat_llh->lgh_id.lgl_oid);
+       if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
+               CWARN("catalog "DOSTID" crosses index zero\n",
+                     POSTID(&cat_llh->lgh_id.lgl_oi));
 
                 cd.lpcd_first_idx = 0;
                 cd.lpcd_last_idx = cat_llh->lgh_last_idx;
@@ -731,11 +733,11 @@ int llog_cat_set_first_idx(struct llog_handle *cathandle, int index)
                         }
                 }
 out:
-                CDEBUG(D_RPCTRACE, "set catlog "LPX64" first idx %u\n",
-                       cathandle->lgh_id.lgl_oid, llh->llh_cat_idx);
-        }
+               CDEBUG(D_RPCTRACE, "set catlog "DOSTID" first idx %u\n",
+                      POSTID(&cathandle->lgh_id.lgl_oi), llh->llh_cat_idx);
+       }
 
-        RETURN(0);
+       RETURN(0);
 }
 
 /* Cleanup deleted plain llog traces from catalog */
@@ -762,8 +764,8 @@ int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle,
        rc = llog_cancel_rec(env, cathandle, index);
        if (rc == 0)
                CDEBUG(D_HA, "cancel plain log at index"
-                      " %u of catalog "LPX64"\n",
-                      index, cathandle->lgh_id.lgl_oid);
+                      " %u of catalog "DOSTID"\n",
+                      index, POSTID(&cathandle->lgh_id.lgl_oi));
        return rc;
 }
 
@@ -781,15 +783,16 @@ int cat_cancel_cb(const struct lu_env *env, struct llog_handle *cathandle,
                CERROR("invalid record in catalog\n");
                RETURN(-EINVAL);
        }
-       CDEBUG(D_HA, "processing log "LPX64":%x at index %u of catalog "
-              LPX64"\n", lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
-              rec->lrh_index, cathandle->lgh_id.lgl_oid);
+
+       CDEBUG(D_HA, "processing log "DOSTID":%x at index %u of catalog "
+              DOSTID"\n", POSTID(&lir->lid_id.lgl_oi), lir->lid_id.lgl_ogen,
+              rec->lrh_index, POSTID(&cathandle->lgh_id.lgl_oi));
 
        rc = llog_cat_id2handle(env, cathandle, &loghandle, &lir->lid_id);
        if (rc) {
-               CERROR("%s: cannot find handle for llog "LPX64": %d\n",
+               CERROR("%s: cannot find handle for llog "DOSTID": %d\n",
                       cathandle->lgh_ctxt->loc_obd->obd_name,
-                      lir->lid_id.lgl_oid, rc);
+                      POSTID(&lir->lid_id.lgl_oi), rc);
                if (rc == -ENOENT || rc == -ESTALE) {
                        /* remove index from catalog */
                        llog_cat_cleanup(env, cathandle, NULL, rec->lrh_index);