LU-459 debug: quiet overly verbose debug messages

[fs/lustre-release.git] / lustre / ptlrpc / sec.c

diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c
index 1494e0d..360c745 100644 (file)
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -287,7 +287,6 @@ struct ptlrpc_cli_ctx *get_my_ctx(struct ptlrpc_sec *sec)
 
 struct ptlrpc_cli_ctx *sptlrpc_cli_ctx_get(struct ptlrpc_cli_ctx *ctx)
 {
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount) > 0);
         cfs_atomic_inc(&ctx->cc_refcount);
         return ctx;
 }
@@ -298,7 +297,7 @@ void sptlrpc_cli_ctx_put(struct ptlrpc_cli_ctx *ctx, int sync)
         struct ptlrpc_sec *sec = ctx->cc_sec;
 
         LASSERT(sec);
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount));
+        LASSERT_ATOMIC_POS(&ctx->cc_refcount);
 
         if (!cfs_atomic_dec_and_test(&ctx->cc_refcount))
                 return;
@@ -483,7 +482,7 @@ int sptlrpc_req_ctx_switch(struct ptlrpc_request *req,
         /* save request message */
         reqmsg_size = req->rq_reqlen;
         if (reqmsg_size != 0) {
-                OBD_ALLOC(reqmsg, reqmsg_size);
+                OBD_ALLOC_LARGE(reqmsg, reqmsg_size);
                 if (reqmsg == NULL)
                         return -ENOMEM;
                 memcpy(reqmsg, req->rq_reqmsg, reqmsg_size);
@@ -511,7 +510,7 @@ int sptlrpc_req_ctx_switch(struct ptlrpc_request *req,
                         req->rq_flvr = old_flvr;
                 }
 
-                OBD_FREE(reqmsg, reqmsg_size);
+                OBD_FREE_LARGE(reqmsg, reqmsg_size);
         }
         return rc;
 }
@@ -823,6 +822,7 @@ void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode)
         switch (opcode) {
         case OST_READ:
         case MDS_READPAGE:
+        case MGS_CONFIG_READ:
                 req->rq_bulk_read = 1;
                 break;
         case OST_WRITE:
@@ -1110,7 +1110,7 @@ int sptlrpc_cli_unwrap_early_reply(struct ptlrpc_request *req,
 
         early_size = req->rq_nob_received;
         early_bufsz = size_roundup_power2(early_size);
-        OBD_ALLOC(early_buf, early_bufsz);
+        OBD_ALLOC_LARGE(early_buf, early_bufsz);
         if (early_buf == NULL)
                 GOTO(err_req, rc = -ENOMEM);
 
@@ -1174,7 +1174,7 @@ int sptlrpc_cli_unwrap_early_reply(struct ptlrpc_request *req,
 err_ctx:
         sptlrpc_cli_ctx_put(early_req->rq_cli_ctx, 1);
 err_buf:
-        OBD_FREE(early_buf, early_bufsz);
+        OBD_FREE_LARGE(early_buf, early_bufsz);
 err_req:
         OBD_FREE_PTR(early_req);
         RETURN(rc);
@@ -1192,7 +1192,7 @@ void sptlrpc_cli_finish_early_reply(struct ptlrpc_request *early_req)
         LASSERT(early_req->rq_repmsg);
 
         sptlrpc_cli_ctx_put(early_req->rq_cli_ctx, 1);
-        OBD_FREE(early_req->rq_repbuf, early_req->rq_repbuf_len);
+        OBD_FREE_LARGE(early_req->rq_repbuf, early_req->rq_repbuf_len);
         OBD_FREE_PTR(early_req);
 }
 
@@ -1230,8 +1230,8 @@ static void sec_cop_destroy_sec(struct ptlrpc_sec *sec)
 {
         struct ptlrpc_sec_policy *policy = sec->ps_policy;
 
-        LASSERT(cfs_atomic_read(&sec->ps_refcount) == 0);
-        LASSERT(cfs_atomic_read(&sec->ps_nctx) == 0);
+        LASSERT_ATOMIC_ZERO(&sec->ps_refcount);
+        LASSERT_ATOMIC_ZERO(&sec->ps_nctx);
         LASSERT(policy->sp_cops->destroy_sec);
 
         CDEBUG(D_SEC, "%s@%p: being destroied\n", sec->ps_policy->sp_name, sec);
@@ -1248,7 +1248,7 @@ EXPORT_SYMBOL(sptlrpc_sec_destroy);
 
 static void sptlrpc_sec_kill(struct ptlrpc_sec *sec)
 {
-        LASSERT(cfs_atomic_read(&sec->ps_refcount) > 0);
+        LASSERT_ATOMIC_POS(&sec->ps_refcount);
 
         if (sec->ps_policy->sp_cops->kill_sec) {
                 sec->ps_policy->sp_cops->kill_sec(sec);
@@ -1259,10 +1259,8 @@ static void sptlrpc_sec_kill(struct ptlrpc_sec *sec)
 
 struct ptlrpc_sec *sptlrpc_sec_get(struct ptlrpc_sec *sec)
 {
-        if (sec) {
-                LASSERT(cfs_atomic_read(&sec->ps_refcount) > 0);
+        if (sec)
                 cfs_atomic_inc(&sec->ps_refcount);
-        }
 
         return sec;
 }
@@ -1271,11 +1269,9 @@ EXPORT_SYMBOL(sptlrpc_sec_get);
 void sptlrpc_sec_put(struct ptlrpc_sec *sec)
 {
         if (sec) {
-                LASSERT(cfs_atomic_read(&sec->ps_refcount) > 0);
+                LASSERT_ATOMIC_POS(&sec->ps_refcount);
 
                 if (cfs_atomic_dec_and_test(&sec->ps_refcount)) {
-                        LASSERT(cfs_atomic_read(&sec->ps_nctx) == 0);
-
                         sptlrpc_gc_del_sec(sec);
                         sec_cop_destroy_sec(sec);
                 }
@@ -1354,7 +1350,7 @@ static void sptlrpc_import_sec_install(struct obd_import *imp,
 {
         struct ptlrpc_sec *old_sec;
 
-        LASSERT(cfs_atomic_read(&sec->ps_refcount) > 0);
+        LASSERT_ATOMIC_POS(&sec->ps_refcount);
 
         cfs_spin_lock(&imp->imp_lock);
         old_sec = imp->imp_sec;
@@ -1471,12 +1467,13 @@ int sptlrpc_import_sec_adapt(struct obd_import *imp,
                         sptlrpc_import_sec_adapt_inplace(imp, sec, &sf);
                         GOTO(out, rc);
                 }
-        } else {
-                CWARN("import %s->%s netid %x: select flavor %s\n",
-                      imp->imp_obd->obd_name,
-                      obd_uuid2str(&conn->c_remote_uuid),
-                      LNET_NIDNET(conn->c_self),
-                      sptlrpc_flavor2name(&sf, str, sizeof(str)));
+        } else if (SPTLRPC_FLVR_BASE(sf.sf_rpc) !=
+                   SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_NULL)) {
+                LCONSOLE_INFO("import %s->%s netid %x: select flavor %s\n",
+                              imp->imp_obd->obd_name,
+                              obd_uuid2str(&conn->c_remote_uuid),
+                              LNET_NIDNET(conn->c_self),
+                              sptlrpc_flavor2name(&sf, str, sizeof(str)));
         }
 
         cfs_mutex_down(&imp->imp_sec_mutex);
@@ -1553,10 +1550,10 @@ int sptlrpc_cli_alloc_reqbuf(struct ptlrpc_request *req, int msgsize)
         int rc;
 
         LASSERT(ctx);
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount));
         LASSERT(ctx->cc_sec);
         LASSERT(ctx->cc_sec->ps_policy);
         LASSERT(req->rq_reqmsg == NULL);
+        LASSERT_ATOMIC_POS(&ctx->cc_refcount);
 
         policy = ctx->cc_sec->ps_policy;
         rc = policy->sp_cops->alloc_reqbuf(ctx->cc_sec, req, msgsize);
@@ -1582,9 +1579,9 @@ void sptlrpc_cli_free_reqbuf(struct ptlrpc_request *req)
         struct ptlrpc_sec_policy *policy;
 
         LASSERT(ctx);
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount));
         LASSERT(ctx->cc_sec);
         LASSERT(ctx->cc_sec->ps_policy);
+        LASSERT_ATOMIC_POS(&ctx->cc_refcount);
 
         if (req->rq_reqbuf == NULL && req->rq_clrbuf == NULL)
                 return;
@@ -1680,7 +1677,6 @@ int sptlrpc_cli_alloc_repbuf(struct ptlrpc_request *req, int msgsize)
         ENTRY;
 
         LASSERT(ctx);
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount));
         LASSERT(ctx->cc_sec);
         LASSERT(ctx->cc_sec->ps_policy);
 
@@ -1702,9 +1698,9 @@ void sptlrpc_cli_free_repbuf(struct ptlrpc_request *req)
         ENTRY;
 
         LASSERT(ctx);
-        LASSERT(cfs_atomic_read(&ctx->cc_refcount));
         LASSERT(ctx->cc_sec);
         LASSERT(ctx->cc_sec->ps_policy);
+        LASSERT_ATOMIC_POS(&ctx->cc_refcount);
 
         if (req->rq_repbuf == NULL)
                 return;
@@ -2182,11 +2178,8 @@ void sptlrpc_svc_ctx_addref(struct ptlrpc_request *req)
 {
         struct ptlrpc_svc_ctx *ctx = req->rq_svc_ctx;
 
-        if (ctx == NULL)
-                return;
-
-        LASSERT(cfs_atomic_read(&ctx->sc_refcount) > 0);
-        cfs_atomic_inc(&ctx->sc_refcount);
+        if (ctx != NULL)
+                cfs_atomic_inc(&ctx->sc_refcount);
 }
 
 void sptlrpc_svc_ctx_decref(struct ptlrpc_request *req)
@@ -2196,7 +2189,7 @@ void sptlrpc_svc_ctx_decref(struct ptlrpc_request *req)
         if (ctx == NULL)
                 return;
 
-        LASSERT(cfs_atomic_read(&ctx->sc_refcount) > 0);
+        LASSERT_ATOMIC_POS(&ctx->sc_refcount);
         if (cfs_atomic_dec_and_test(&ctx->sc_refcount)) {
                 if (ctx->sc_policy->sp_sops->free_ctx)
                         ctx->sc_policy->sp_sops->free_ctx(ctx);
@@ -2211,7 +2204,7 @@ void sptlrpc_svc_ctx_invalidate(struct ptlrpc_request *req)
         if (ctx == NULL)
                 return;
 
-        LASSERT(cfs_atomic_read(&ctx->sc_refcount) > 0);
+        LASSERT_ATOMIC_POS(&ctx->sc_refcount);
         if (ctx->sc_policy->sp_sops->invalidate_ctx)
                 ctx->sc_policy->sp_sops->invalidate_ctx(ctx);
 }
@@ -2507,7 +2500,7 @@ EXPORT_SYMBOL(sptlrpc_flavor_has_bulk);
  * initialize/finalize                  *
  ****************************************/
 
-int __init sptlrpc_init(void)
+int sptlrpc_init(void)
 {
         int rc;
 
@@ -2553,7 +2546,7 @@ out:
         return rc;
 }
 
-void __exit sptlrpc_fini(void)
+void sptlrpc_fini(void)
 {
         sptlrpc_lproc_fini();
         sptlrpc_plain_fini();