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 0fbd562..360c745 100644 (file)
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -822,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:
@@ -1466,7 +1467,8 @@ int sptlrpc_import_sec_adapt(struct obd_import *imp,
                         sptlrpc_import_sec_adapt_inplace(imp, sec, &sf);
                         GOTO(out, rc);
                 }
-        } else if (sptlrpc_flavor2name_base(sf.sf_rpc) != SPTLRPC_FLVR_NULL) {
+        } 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),
@@ -2498,7 +2500,7 @@ EXPORT_SYMBOL(sptlrpc_flavor_has_bulk);
  * initialize/finalize                  *
  ****************************************/
 
-int __init sptlrpc_init(void)
+int sptlrpc_init(void)
 {
         int rc;
 
@@ -2544,7 +2546,7 @@ out:
         return rc;
 }
 
-void __exit sptlrpc_fini(void)
+void sptlrpc_fini(void)
 {
         sptlrpc_lproc_fini();
         sptlrpc_plain_fini();