X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_server.c;h=ca91a1c9491ac4c66de8fd24a67608690c9f6518;hb=48e409e65edda13dd647cf37458a7a8ae8218a23;hp=1371aa7354e07f0e3ee6ab3b53a20d5387ee1b34;hpb=1f1d3a376d488d715dd1b0c94d5b66ea05c1e6ca;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c
index 1371aa7..ca91a1c 100644
--- a/lustre/ptlrpc/llog_server.c
+++ b/lustre/ptlrpc/llog_server.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -114,47 +110,6 @@ out_ctxt:
 	llog_ctxt_put(ctxt);
 	return rc;
 }
-EXPORT_SYMBOL(llog_origin_handle_open);
-
-int llog_origin_handle_destroy(struct ptlrpc_request *req)
-{
-	struct llogd_body	*body;
-	struct llog_logid	*logid = NULL;
-	struct llog_ctxt	*ctxt;
-	int			 rc;
-
-	ENTRY;
-
-	body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
-	if (body == NULL)
-		RETURN(err_serious(-EFAULT));
-
-	rc = req_capsule_server_pack(&req->rq_pill);
-	if (rc < 0)
-		RETURN(err_serious(-ENOMEM));
-
-	if (ostid_id(&body->lgd_logid.lgl_oi) > 0)
-		logid = &body->lgd_logid;
-
-	if (!(body->lgd_llh_flags & LLOG_F_IS_PLAIN))
-		CERROR("%s: wrong llog flags %x\n",
-		       req->rq_export->exp_obd->obd_name, body->lgd_llh_flags);
-
-	if (body->lgd_ctxt_idx >= LLOG_MAX_CTXTS) {
-		CDEBUG(D_WARNING, "%s: bad ctxt ID: idx=%d\n",
-		       req->rq_export->exp_obd->obd_name, body->lgd_ctxt_idx);
-		RETURN(-EPROTO);
-	}
-
-	ctxt = llog_get_context(req->rq_export->exp_obd, body->lgd_ctxt_idx);
-	if (ctxt == NULL)
-		RETURN(-ENODEV);
-
-	rc = llog_erase(req->rq_svc_thread->t_env, ctxt, logid, NULL);
-	llog_ctxt_put(ctxt);
-	RETURN(rc);
-}
-EXPORT_SYMBOL(llog_origin_handle_destroy);
 
 int llog_origin_handle_next_block(struct ptlrpc_request *req)
 {
@@ -173,7 +128,7 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req)
 		RETURN(err_serious(-EFAULT));
 
 	req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER,
-			     LLOG_CHUNK_SIZE);
+			     LLOG_MIN_CHUNK_SIZE);
 	rc = req_capsule_server_pack(&req->rq_pill);
 	if (rc)
 		RETURN(err_serious(-ENOMEM));
@@ -205,7 +160,8 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req)
 	ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
 	rc = llog_next_block(req->rq_svc_thread->t_env, loghandle,
 			     &repbody->lgd_saved_index, repbody->lgd_index,
-			     &repbody->lgd_cur_offset, ptr, LLOG_CHUNK_SIZE);
+			     &repbody->lgd_cur_offset, ptr,
+			     LLOG_MIN_CHUNK_SIZE);
 	if (rc)
 		GOTO(out_close, rc);
 	EXIT;
@@ -215,7 +171,6 @@ out_ctxt:
 	llog_ctxt_put(ctxt);
 	return rc;
 }
-EXPORT_SYMBOL(llog_origin_handle_next_block);
 
 int llog_origin_handle_prev_block(struct ptlrpc_request *req)
 {
@@ -234,7 +189,7 @@ int llog_origin_handle_prev_block(struct ptlrpc_request *req)
 		RETURN(err_serious(-EFAULT));
 
 	req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER,
-			     LLOG_CHUNK_SIZE);
+			     LLOG_MIN_CHUNK_SIZE);
 	rc = req_capsule_server_pack(&req->rq_pill);
 	if (rc)
 		RETURN(err_serious(-ENOMEM));
@@ -265,7 +220,7 @@ int llog_origin_handle_prev_block(struct ptlrpc_request *req)
 
 	ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
 	rc = llog_prev_block(req->rq_svc_thread->t_env, loghandle,
-			     body->lgd_index, ptr, LLOG_CHUNK_SIZE);
+			     body->lgd_index, ptr, LLOG_MIN_CHUNK_SIZE);
 	if (rc)
 		GOTO(out_close, rc);
 
@@ -276,7 +231,6 @@ out_ctxt:
 	llog_ctxt_put(ctxt);
 	return rc;
 }
-EXPORT_SYMBOL(llog_origin_handle_prev_block);
 
 int llog_origin_handle_read_header(struct ptlrpc_request *req)
 {
@@ -331,17 +285,3 @@ out_ctxt:
 	llog_ctxt_put(ctxt);
 	return rc;
 }
-EXPORT_SYMBOL(llog_origin_handle_read_header);
-
-int llog_origin_handle_close(struct ptlrpc_request *req)
-{
-	int	 rc;
-
-	ENTRY;
-
-	rc = req_capsule_server_pack(&req->rq_pill);
-	if (rc)
-		RETURN(err_serious(-ENOMEM));
-	RETURN(0);
-}
-EXPORT_SYMBOL(llog_origin_handle_close);