libcfs: fixes to CDEBUG(), LASSERT() and friends to reduce stack consumption (Attempt 2.)

diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
index 89bb2fe..60a3cec 100644 (file)
--- a/lustre/include/linux/lustre_net.h
+++ b/lustre/include/linux/lustre_net.h
@@ -432,6 +432,14 @@ do {                                                                           \
             __DEBUG_REQ(CDEBUG, level, req, fmt, ## args);                     \
 } while (0)
 
+#define DEBUG_REQ_EX(level, req, fmt, args...)                          \
+do {                                                                    \
+        if ((level) & (D_ERROR | D_WARNING))                            \
+            __DEBUG_REQ(CDEBUG_LIMIT, D_ERROR, req, fmt, ## args);      \
+        else                                                            \
+            __DEBUG_REQ(CDEBUG_EX, level, req, fmt, ## args);           \
+} while (0)
+
 struct ptlrpc_bulk_page {
         struct list_head bp_link;
         int bp_buflen;

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 03c545c..03da517 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1451,7 +1451,7 @@ int target_handle_dqacq_callback(struct ptlrpc_request *req)
         LASSERT(qctxt->lqc_handler);
         rc = qctxt->lqc_handler(master_obd, qdata, req->rq_reqmsg->opc);
         if (rc && rc != -EDQUOT)
-                CDEBUG(rc == -EBUSY  ? D_QUOTA : D_ERROR, 
+                CDEBUG_EX(rc == -EBUSY  ? D_QUOTA : D_ERROR,
                        "dqacq failed! (rc:%d)\n", rc);
 
         /* the qd_count might be changed in lqc_handler */

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 02d2a29..cce090a 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -1230,48 +1230,48 @@ void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos)
                 return;
 
         if (!lock) {
-                CDEBUG(level, "  NULL LDLM lock\n");
+                CDEBUG_EX(level, "  NULL LDLM lock\n");
                 return;
         }
 
-        CDEBUG(level," -- Lock dump: %p/"LPX64" (rc: %d) (pos: %d) (pid: %d)\n",
+        CDEBUG_EX(level," -- Lock dump: %p/"LPX64" (rc: %d) (pos: %d) (pid: %d)\n",
                lock, lock->l_handle.h_cookie, atomic_read(&lock->l_refc),
                pos, lock->l_pid);
         if (lock->l_conn_export != NULL)
                 obd = lock->l_conn_export->exp_obd;
         if (lock->l_export && lock->l_export->exp_connection) {
-                CDEBUG(level, "  Node: NID %s (rhandle: "LPX64")\n",
+                CDEBUG_EX(level, "  Node: NID %s (rhandle: "LPX64")\n",
                      libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid),
                      lock->l_remote_handle.cookie);
         } else if (obd == NULL) {
-                CDEBUG(level, "  Node: local\n");
+                CDEBUG_EX(level, "  Node: local\n");
         } else {
                 struct obd_import *imp = obd->u.cli.cl_import;
-                CDEBUG(level, "  Node: NID %s (rhandle: "LPX64")\n",
+                CDEBUG_EX(level, "  Node: NID %s (rhandle: "LPX64")\n",
                        libcfs_nid2str(imp->imp_connection->c_peer.nid),
                        lock->l_remote_handle.cookie);
         }
-        CDEBUG(level, "  Resource: %p ("LPU64"/"LPU64")\n", lock->l_resource,
+        CDEBUG_EX(level, "  Resource: %p ("LPU64"/"LPU64")\n", lock->l_resource,
                lock->l_resource->lr_name.name[0],
                lock->l_resource->lr_name.name[1]);
-        CDEBUG(level, "  Req mode: %s, grant mode: %s, rc: %u, read: %d, "
+        CDEBUG_EX(level, "  Req mode: %s, grant mode: %s, rc: %u, read: %d, "
                "write: %d flags: %#x\n", ldlm_lockname[lock->l_req_mode],
                ldlm_lockname[lock->l_granted_mode],
                atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers,
                lock->l_flags);
         if (lock->l_resource->lr_type == LDLM_EXTENT)
-                CDEBUG(level, "  Extent: "LPU64" -> "LPU64
+                CDEBUG_EX(level, "  Extent: "LPU64" -> "LPU64
                        " (req "LPU64"-"LPU64")\n",
                        lock->l_policy_data.l_extent.start,
                        lock->l_policy_data.l_extent.end,
                        lock->l_req_extent.start, lock->l_req_extent.end);
         else if (lock->l_resource->lr_type == LDLM_FLOCK)
-                CDEBUG(level, "  Pid: %d Extent: "LPU64" -> "LPU64"\n",
+                CDEBUG_EX(level, "  Pid: %d Extent: "LPU64" -> "LPU64"\n",
                        lock->l_policy_data.l_flock.pid,
                        lock->l_policy_data.l_flock.start,
                        lock->l_policy_data.l_flock.end);
        else if (lock->l_resource->lr_type == LDLM_IBITS)
-                CDEBUG(level, "  Bits: "LPX64"\n",
+                CDEBUG_EX(level, "  Bits: "LPX64"\n",
                        lock->l_policy_data.l_inodebits.bits);
 }
 

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 19bd0e5..e2e8fa9 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -710,7 +710,7 @@ void ldlm_namespace_dump(int level, struct ldlm_namespace *ns)
 {
         struct list_head *tmp;
 
-        CDEBUG(level, "--- Namespace: %s (rc: %d, client: %d)\n", ns->ns_name,
+        CDEBUG_EX(level, "--- Namespace: %s (rc: %d, client: %d)\n", ns->ns_name,
                atomic_read(&ns->ns_refcount), ns->ns_client);
 
         l_lock(&ns->ns_lock);
@@ -736,14 +736,14 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res)
         if (RES_NAME_SIZE != 4)
                 LBUG();
 
-        CDEBUG(level, "--- Resource: %p ("LPU64"/"LPU64"/"LPU64"/"LPU64
+        CDEBUG_EX(level, "--- Resource: %p ("LPU64"/"LPU64"/"LPU64"/"LPU64
                ") (rc: %d)\n", res, res->lr_name.name[0], res->lr_name.name[1],
                res->lr_name.name[2], res->lr_name.name[3],
                atomic_read(&res->lr_refcount));
 
         if (!list_empty(&res->lr_granted)) {
                 pos = 0;
-                CDEBUG(level, "Granted locks:\n");
+                CDEBUG_EX(level, "Granted locks:\n");
                 list_for_each(tmp, &res->lr_granted) {
                         struct ldlm_lock *lock;
                         lock = list_entry(tmp, struct ldlm_lock, l_res_link);
@@ -752,7 +752,7 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res)
         }
         if (!list_empty(&res->lr_converting)) {
                 pos = 0;
-                CDEBUG(level, "Converting locks:\n");
+                CDEBUG_EX(level, "Converting locks:\n");
                 list_for_each(tmp, &res->lr_converting) {
                         struct ldlm_lock *lock;
                         lock = list_entry(tmp, struct ldlm_lock, l_res_link);
@@ -761,7 +761,7 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res)
         }
         if (!list_empty(&res->lr_waiting)) {
                 pos = 0;
-                CDEBUG(level, "Waiting locks:\n");
+                CDEBUG_EX(level, "Waiting locks:\n");
                 list_for_each(tmp, &res->lr_waiting) {
                         struct ldlm_lock *lock;
                         lock = list_entry(tmp, struct ldlm_lock, l_res_link);

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 64a80a7..69058a9 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -788,10 +788,15 @@ struct inode *ll_inode_from_lock(struct ldlm_lock *lock)
                         inode = igrab(lock->l_ast_data);
                 } else {
                         inode = lock->l_ast_data;
-                        __LDLM_DEBUG(inode->i_state & I_FREEING ?
-                                     D_INFO : D_WARNING, lock,
+                        if (inode->i_state & I_FREEING)
+                                __LDLM_DEBUG(D_INFO, lock,
                                      "l_ast_data %p is bogus: magic %08x",
                                      lock->l_ast_data, lli->lli_inode_magic);
+                        else
+                                __LDLM_DEBUG(D_WARNING, lock,
+                                     "l_ast_data %p is bogus: magic %08x",
+                                     lock->l_ast_data, lli->lli_inode_magic);
+
                         inode = NULL;
                 }
         }

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index 70cecba..f33e24b 100644 (file)
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -42,15 +42,15 @@ void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm)
         struct lov_ost_data_v1 *lod;
         int i;
 
-        CDEBUG(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
+        CDEBUG_EX(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
                le64_to_cpu(lmm->lmm_object_id), le32_to_cpu(lmm->lmm_magic),
                le32_to_cpu(lmm->lmm_pattern));
-        CDEBUG(level,"stripe_size %u, stripe_count %u\n",
+        CDEBUG_EX(level,"stripe_size %u, stripe_count %u\n",
                le32_to_cpu(lmm->lmm_stripe_size),
                le32_to_cpu(lmm->lmm_stripe_count));
         for (i = 0, lod = lmm->lmm_objects;
              i < le32_to_cpu(lmm->lmm_stripe_count); i++, lod++)
-                CDEBUG(level, "stripe %u idx %u subobj "LPX64"/"LPX64"\n",
+                CDEBUG_EX(level, "stripe %u idx %u subobj "LPX64"/"LPX64"\n",
                        i, le32_to_cpu(lod->l_ost_idx),
                        le64_to_cpu(lod->l_object_gr),
                        le64_to_cpu(lod->l_object_id));
@@ -59,11 +59,11 @@ void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm)
 void lov_dump_lmm_join(int level, struct lov_mds_md_join *lmmj)
 {
 
-        CDEBUG(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
+        CDEBUG_EX(level, "objid "LPX64", magic 0x%08X, pattern %#X\n",
                le64_to_cpu(lmmj->lmmj_md.lmm_object_id),
                le32_to_cpu(lmmj->lmmj_md.lmm_magic),
                le32_to_cpu(lmmj->lmmj_md.lmm_pattern));
-        CDEBUG(level,"stripe_size %u, stripe_count %u extent_count %u \n",
+        CDEBUG_EX(level,"stripe_size %u, stripe_count %u extent_count %u \n",
                le32_to_cpu(lmmj->lmmj_md.lmm_stripe_size),
                le32_to_cpu(lmmj->lmmj_md.lmm_stripe_count),
                le32_to_cpu(lmmj->lmmj_extent_count));

diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index 7648df1..69c3616 100644 (file)
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -502,7 +502,7 @@ static void __exit lvfs_linux_exit(void)
         ENTRY;
 
         leaked = atomic_read(&obd_memory);
-        CDEBUG(leaked ? D_ERROR : D_INFO,
+        CDEBUG_EX(leaked ? D_ERROR : D_INFO,
                "obd mem max: %d leaked: %d\n", obd_memmax, leaked);
 
         return;

diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index fa61823..72af624 100644 (file)
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -173,7 +173,7 @@ int mds_client_free(struct obd_export *exp)
                                          sizeof(zero_mcd), &off, 1);
                 pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
 
-                CDEBUG(rc == 0 ? D_INFO : D_ERROR,
+                CDEBUG_EX(rc == 0 ? D_INFO : D_ERROR,
                        "zeroing out client %s idx %u in %s rc %d\n",
                        med->med_mcd->mcd_uuid, med->med_lr_idx, LAST_RCVD, rc);
         }

diff --git a/lustre/mds/mds_join.c b/lustre/mds/mds_join.c
index 5aa3c64..5075bfb 100644 (file)
--- a/lustre/mds/mds_join.c
+++ b/lustre/mds/mds_join.c
@@ -393,7 +393,7 @@ int mds_join_file(struct mds_update_record *rec, struct ptlrpc_request *req,
         if (rc < 0)
                 GOTO(cleanup, rc);
 
-        LASSERTF(le32_to_cpu(head_lmm->lmm_magic) == LOV_MAGIC_JOIN ||
+        LASSERT(le32_to_cpu(head_lmm->lmm_magic) == LOV_MAGIC_JOIN ||
                 le32_to_cpu(head_lmm->lmm_magic) == LOV_MAGIC);
 
         push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);

diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
index c1d5366..f70a487 100644 (file)
--- a/lustre/mds/mds_open.c
+++ b/lustre/mds/mds_open.c
@@ -414,7 +414,7 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset,
                         int level = D_ERROR;
                         if (rc == -ENOSPC)
                                 level = D_INODE;
-                        CDEBUG(level, "error creating objects for "
+                        CDEBUG_EX(level, "error creating objects for "
                                       "inode %lu: rc = %d\n",
                                inode->i_ino, rc);
                         if (rc > 0) {

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 8316435..3905d1f 100644 (file)
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -182,7 +182,7 @@ int mds_finish_transno(struct mds_obd *mds, struct inode *inode, void *handle,
                         rc = err;
         }
 
-        DEBUG_REQ(log_pri, req,
+        DEBUG_REQ_EX(log_pri, req,
                      "wrote trans #"LPU64" rc %d client %s at idx %u: err = %d",
                      transno, rc, mcd->mcd_uuid, med->med_lr_idx, err);
 
@@ -192,7 +192,7 @@ int mds_finish_transno(struct mds_obd *mds, struct inode *inode, void *handle,
                 if (rc == 0)
                         rc = err;
         }
-        CDEBUG(log_pri, "wrote objids: err = %d\n", err);
+        CDEBUG_EX(log_pri, "wrote objids: err = %d\n", err);
 
 commit:
         err = fsfilt_commit(obd, inode, handle, 0);

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index 0bb788b..671529d 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -541,7 +541,7 @@ int mgs_handle(struct ptlrpc_request *req)
 
         LASSERT(current->journal_info == NULL);
 
-        CDEBUG(D_CONFIG | (rc?D_ERROR:0), "MGS handle cmd=%d rc=%d\n",
+        CDEBUG_EX(D_CONFIG | (rc?D_ERROR:0), "MGS handle cmd=%d rc=%d\n",
                req->rq_reqmsg->opc, rc);
 
  out:

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index 4024823..90c57e1 100644 (file)
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -102,7 +102,7 @@ int dump_obdo(struct obdo *oa)
 
 void dump_lsm(int level, struct lov_stripe_md *lsm)
 {
-        CDEBUG(level, "lsm %p, objid "LPX64", maxbytes "LPX64", magic 0x%08X, "
+        CDEBUG_EX(level, "lsm %p, objid "LPX64", maxbytes "LPX64", magic 0x%08X, "
                "stripe_size %u, stripe_count %u\n", lsm,
                lsm->lsm_object_id, lsm->lsm_maxbytes, lsm->lsm_magic,
                lsm->lsm_stripe_size, lsm->lsm_stripe_count);

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index db424a5..3521135 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -126,7 +126,7 @@ int filter_finish_transno(struct obd_export *exp, struct obd_trans_info *oti,
                         rc = err;
         }
 
-        CDEBUG(log_pri, "wrote trans "LPU64" for client %s at #%d: err = %d\n",
+        CDEBUG_EX(log_pri, "wrote trans "LPU64" for client %s at #%d: err = %d\n",
                last_rcvd, fcd->fcd_uuid, fed->fed_lr_idx, err);
 
         RETURN(rc);
@@ -281,7 +281,7 @@ static int filter_client_free(struct obd_export *exp)
                                                   filter->fo_fsd, 1);
                 pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
 
-                CDEBUG(rc == 0 ? D_INFO : D_ERROR,
+                CDEBUG_EX(rc == 0 ? D_INFO : D_ERROR,
                        "zeroing out client %s at idx %u (%llu) in %s rc %d\n",
                        fed->fed_fcd->fcd_uuid, fed->fed_lr_idx, fed->fed_lr_off,
                        LAST_RCVD, rc);
@@ -2242,7 +2242,7 @@ out_unlock:
                 unsigned int cur_ids[MAXQUOTAS] = {oa->o_uid, oa->o_gid};
                 int rc2 = lquota_adjust(quota_interface, exp->exp_obd, cur_ids,
                                         orig_ids, rc, FSFILT_OP_SETATTR);
-                CDEBUG(rc2 ? D_ERROR : D_QUOTA,
+                CDEBUG_EX(rc2 ? D_ERROR : D_QUOTA,
                        "filter adjust qunit. (rc:%d)\n", rc2);
         }
         return rc;
@@ -2830,7 +2830,7 @@ cleanup:
         qcids[GRPQUOTA] = oa->o_gid;
         rc2 = lquota_adjust(quota_interface, obd, qcids, NULL, rc,
                             FSFILT_OP_UNLINK);
-        CDEBUG(rc2 ? D_ERROR : D_QUOTA,
+        CDEBUG_EX(rc2 ? D_ERROR : D_QUOTA,
                "filter adjust qunit! (rc:%d)\n", rc2);
         return rc;
 }

diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index c8c1b6b..cf7140d 100644 (file)
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -107,7 +107,7 @@ static void filter_grant_incoming(struct obd_export *exp, struct obdo *oa)
         /* Add some margin, since there is a small race if other RPCs arrive
          * out-or-order and have already consumed some grant.  We want to
          * leave this here in case there is a large error in accounting. */
-        CDEBUG(oa->o_grant > fed->fed_grant + FILTER_GRANT_CHUNK ? mask:D_CACHE,
+        CDEBUG_EX(oa->o_grant > fed->fed_grant + FILTER_GRANT_CHUNK ? mask:D_CACHE,
                "%s: cli %s/%p reports grant: "LPU64" dropped: %u, local: %lu\n",
                obd->obd_name, exp->exp_client_uuid.uuid, exp, oa->o_grant,
                oa->o_dropped, fed->fed_grant);
@@ -458,7 +458,7 @@ static int filter_grant_check(struct obd_export *exp, int objcount,
         fed->fed_pending += used;
         exp->exp_obd->u.filter.fo_tot_pending += used;
 
-        CDEBUG(mask,
+        CDEBUG_EX(mask,
                "%s: cli %s/%p used: %lu ungranted: %lu grant: %lu dirty: %lu\n",
                exp->exp_obd->obd_name, exp->exp_client_uuid.uuid, exp, used,
                ungranted, fed->fed_grant, fed->fed_dirty);

diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c
index 2924b6e..1bd4995 100644 (file)
--- a/lustre/obdfilter/filter_io_26.c
+++ b/lustre/obdfilter/filter_io_26.c
@@ -600,7 +600,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
         if (IS_ERR(oti->oti_handle)) {
                 UNLOCK_INODE_MUTEX(inode);
                 rc = PTR_ERR(oti->oti_handle);
-                CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR,
+                CDEBUG_EX(rc == -ENOSPC ? D_INODE : D_ERROR,
                        "error starting transaction: rc = %d\n", rc);
                 oti->oti_handle = NULL;
                 GOTO(cleanup, rc);
@@ -683,7 +683,7 @@ cleanup:
         qcids[GRPQUOTA] = oa->o_gid;
         err = lquota_adjust(quota_interface, obd, qcids, NULL, rc,
                             FSFILT_OP_CREATE);
-        CDEBUG(err ? D_ERROR : D_QUOTA,
+        CDEBUG_EX(err ? D_ERROR : D_QUOTA,
                "error filter adjust qunit! (rc:%d)\n", err);
 
         RETURN(rc);

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index 261d18a..2222df9 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -50,7 +50,7 @@ void request_out_callback(lnet_event_t *ev)
                  ev->type == LNET_EVENT_UNLINK);
         LASSERT (ev->unlinked);
 
-        DEBUG_REQ((ev->status == 0) ? D_NET : D_ERROR, req,
+        DEBUG_REQ_EX((ev->status == 0) ? D_NET : D_ERROR, req,
                      "type %d, status %d", ev->type, ev->status);
 
         if (ev->type == LNET_EVENT_UNLINK || ev->status != 0) {
@@ -89,7 +89,7 @@ void reply_in_callback(lnet_event_t *ev)
         LASSERT (ev->offset == 0);
         LASSERT (ev->mlength <= req->rq_replen);
 
-        DEBUG_REQ((ev->status == 0) ? D_NET : D_ERROR, req,
+        DEBUG_REQ_EX((ev->status == 0) ? D_NET : D_ERROR, req,
                      "type %d, status %d", ev->type, ev->status);
 
         spin_lock_irqsave (&req->rq_lock, flags);
@@ -127,7 +127,7 @@ void client_bulk_callback (lnet_event_t *ev)
                  ev->type == LNET_EVENT_UNLINK);
         LASSERT (ev->unlinked);
 
-        CDEBUG((ev->status == 0) ? D_NET : D_ERROR,
+        CDEBUG_EX((ev->status == 0) ? D_NET : D_ERROR,
                "event type %d, status %d, desc %p\n",
                ev->type, ev->status, desc);
 
@@ -167,7 +167,7 @@ void request_in_callback(lnet_event_t *ev)
         LASSERT ((char *)ev->md.start + ev->offset + ev->mlength <=
                  rqbd->rqbd_buffer + service->srv_buf_size);
 
-        CDEBUG((ev->status == 0) ? D_NET : D_ERROR,
+        CDEBUG_EX((ev->status == 0) ? D_NET : D_ERROR,
                "event type %d, status %d, service %s\n",
                ev->type, ev->status, service->srv_name);
 
@@ -301,7 +301,7 @@ void server_bulk_callback (lnet_event_t *ev)
                  (desc->bd_type == BULK_GET_SINK &&
                   ev->type == LNET_EVENT_REPLY));
 
-        CDEBUG((ev->status == 0) ? D_NET : D_ERROR,
+        CDEBUG_EX((ev->status == 0) ? D_NET : D_ERROR,
                "event type %d, status %d, desc %p\n",
                ev->type, ev->status, desc);
 

diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c
index 159ef9b..cfdce8d 100644 (file)
--- a/lustre/ptlrpc/pinger.c
+++ b/lustre/ptlrpc/pinger.c
@@ -111,7 +111,7 @@ static int ptlrpc_pinger_main(void *arg)
                         imp->imp_force_verify = 0;
                         spin_unlock_irqrestore(&imp->imp_lock, flags);
 
-                        CDEBUG(level == LUSTRE_IMP_FULL ? D_INFO : D_HA,
+                        CDEBUG_EX(level == LUSTRE_IMP_FULL ? D_INFO : D_HA,
                                "level %s/%u force %u deactive %u pingable %u\n",
                                ptlrpc_import_state_name(level), level,
                                force, imp->imp_deactive, imp->imp_pingable);

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index 1c9bbcc..3aab55c 100644 (file)
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -743,7 +743,7 @@ static int qslave_recovery_main(void *arg)
                                 rc = 0;
 
                         if (rc)
-                                CDEBUG(rc == -EBUSY ? D_QUOTA : D_ERROR, 
+                                CDEBUG_EX(rc == -EBUSY ? D_QUOTA : D_ERROR,
                                        "qslave recovery failed! (id:%d type:%d "
                                        " rc:%d)\n", dqid->di_id, type, rc);
 free:

diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c
index dddf1a7..5edd982 100644 (file)
--- a/lustre/quota/quota_interface.c
+++ b/lustre/quota/quota_interface.c
@@ -195,7 +195,7 @@ static int auto_quota_on(struct obd_device *obd, int type,
 local_quota:
         /* turn on local quota */
         rc = fsfilt_quotactl(obd, sb, oqctl);
-        CDEBUG(rc ? D_ERROR : D_INFO, "auto-enable quota. rc=%d\n", rc);
+        CDEBUG_EX(rc ? D_ERROR : D_INFO, "auto-enable quota. rc=%d\n", rc);
         if (rc && is_master)
                 mds_quota_off(obd, oqctl);
 out_pop:

diff --git a/lustre/tests/checkstack.pl b/lustre/tests/checkstack.pl
index 3504e96..c59c970 100644 (file)
--- a/lustre/tests/checkstack.pl
+++ b/lustre/tests/checkstack.pl
@@ -27,8 +27,8 @@
 # use anything else and feel the pain ;)
 {
        my $arch = shift;
-       $x      = "[0-9a-f]{3,5}";              # hex number     >= 256
-       $d      = "([0-9]{2}|[2-9])[0-9]{2}";   # decimal number >= 200
+       $x      = "[0-9a-f]{1,5}";              # hex number
+       $d      = "[0-9]{1,5}"; # decimal number
        if ($arch eq "") {
                $arch = `uname -m`;
        }