LU-6349 ptlrpc: remove LUSTRE_MSG_MAGIC_V1 support

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

diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index c44fe83..c560e72 100644 (file)
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -241,7 +241,6 @@ int ptlrpc_start_bulk_transfer(struct ptlrpc_bulk_desc *desc)
 
        RETURN(0);
 }
-EXPORT_SYMBOL(ptlrpc_start_bulk_transfer);
 
 /**
  * Server side bulk abort. Idempotent. Not thread-safe (i.e. only
@@ -282,7 +281,6 @@ void ptlrpc_abort_bulk(struct ptlrpc_bulk_desc *desc)
                CWARN("Unexpectedly long timeout: desc %p\n", desc);
        }
 }
-EXPORT_SYMBOL(ptlrpc_abort_bulk);
 #endif /* HAVE_SERVER_SUPPORT */
 
 /**
@@ -411,7 +409,6 @@ int ptlrpc_register_bulk(struct ptlrpc_request *req)
 
        RETURN(0);
 }
-EXPORT_SYMBOL(ptlrpc_register_bulk);
 
 /**
  * Disconnect a bulk desc from the network. Idempotent. Not
@@ -475,7 +472,6 @@ int ptlrpc_unregister_bulk(struct ptlrpc_request *req, int async)
         }
         RETURN(0);
 }
-EXPORT_SYMBOL(ptlrpc_unregister_bulk);
 
 static void ptlrpc_at_set_reply(struct ptlrpc_request *req, int flags)
 {
@@ -504,7 +500,7 @@ static void ptlrpc_at_set_reply(struct ptlrpc_request *req, int flags)
         /* Report actual service time for client latency calc */
         lustre_msg_set_service_time(req->rq_repmsg, service_time);
         /* Report service time estimate for future client reqs, but report 0
-         * (to be ignored by client) if it's a error reply during recovery.
+        * (to be ignored by client) if it's an error reply during recovery.
          * (bz15815) */
         if (req->rq_type == PTL_RPC_MSG_ERR &&
             (req->rq_export == NULL || req->rq_export->exp_obd->obd_recovering))
@@ -513,21 +509,20 @@ static void ptlrpc_at_set_reply(struct ptlrpc_request *req, int flags)
                 lustre_msg_set_timeout(req->rq_repmsg,
                                       at_get(&svcpt->scp_at_estimate));
 
-        if (req->rq_reqmsg &&
-            !(lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT)) {
-                CDEBUG(D_ADAPTTO, "No early reply support: flags=%#x "
-                       "req_flags=%#x magic=%d:%x/%x len=%d\n",
-                       flags, lustre_msg_get_flags(req->rq_reqmsg),
-                       lustre_msg_is_v1(req->rq_reqmsg),
-                       lustre_msg_get_magic(req->rq_reqmsg),
-                       lustre_msg_get_magic(req->rq_repmsg), req->rq_replen);
-        }
+       if (req->rq_reqmsg &&
+           !(lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT)) {
+               CDEBUG(D_ADAPTTO, "No early reply support: flags=%#x "
+                      "req_flags=%#x magic=%x/%x len=%d\n",
+                      flags, lustre_msg_get_flags(req->rq_reqmsg),
+                      lustre_msg_get_magic(req->rq_reqmsg),
+                      lustre_msg_get_magic(req->rq_repmsg), req->rq_replen);
+       }
 }
 
 /**
  * Send request reply from request \a req reply buffer.
  * \a flags defines reply types
- * Returns 0 on sucess or error code
+ * Returns 0 on success or error code
  */
 int ptlrpc_send_reply(struct ptlrpc_request *req, int flags)
 {
@@ -614,7 +609,6 @@ out:
         ptlrpc_connection_put(conn);
         return rc;
 }
-EXPORT_SYMBOL(ptlrpc_send_reply);
 
 int ptlrpc_reply (struct ptlrpc_request *req)
 {
@@ -623,7 +617,6 @@ int ptlrpc_reply (struct ptlrpc_request *req)
         else
                 return (ptlrpc_send_reply(req, 0));
 }
-EXPORT_SYMBOL(ptlrpc_reply);
 
 /**
  * For request \a req send an error reply back. Create empty
@@ -651,13 +644,11 @@ int ptlrpc_send_error(struct ptlrpc_request *req, int may_be_difficult)
         rc = ptlrpc_send_reply(req, may_be_difficult);
         RETURN(rc);
 }
-EXPORT_SYMBOL(ptlrpc_send_error);
 
 int ptlrpc_error(struct ptlrpc_request *req)
 {
         return ptlrpc_send_error(req, 0);
 }
-EXPORT_SYMBOL(ptlrpc_error);
 
 /**
  * Send request \a request.