*
* 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
*/
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_LOG
+#include <linux/list.h>
#include <libcfs/libcfs.h>
#include <obd_class.h>
#include <lustre_log.h>
#include <lustre_net.h>
-#include <libcfs/list.h>
#define LLOG_CLIENT_ENTRY(ctxt, imp) do { \
mutex_lock(&ctxt->loc_mutex); \
}
static int llog_client_destroy(const struct lu_env *env,
- struct llog_handle *loghandle)
+ struct llog_handle *loghandle,
+ struct thandle *th)
{
struct obd_import *imp;
struct ptlrpc_request *req = NULL;
req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER, len);
ptlrpc_request_set_replen(req);
rc = ptlrpc_queue_wait(req);
- if (rc)
- GOTO(out, rc);
+ /* -EIO has a special meaning here. If llog_osd_next_block()
+ * reaches the end of the log without finding the desired
+ * record then it updates *cur_offset and *cur_idx and returns
+ * -EIO. In llog_process_thread() we use this to detect
+ * EOF. But we must be careful to distinguish between -EIO
+ * coming from llog_osd_next_block() and -EIO coming from
+ * ptlrpc or below. */
+ if (rc == -EIO) {
+ if (req->rq_repmsg == NULL ||
+ lustre_msg_get_status(req->rq_repmsg) != -EIO)
+ GOTO(out, rc);
+ } else if (rc < 0) {
+ GOTO(out, rc);
+ }
- body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
- if (body == NULL)
- GOTO(out, rc =-EFAULT);
+ body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
+ if (body == NULL)
+ GOTO(out, rc = -EFAULT);
+
+ *cur_idx = body->lgd_saved_index;
+ *cur_offset = body->lgd_cur_offset;
+
+ if (rc < 0)
+ GOTO(out, rc);
/* The log records are swabbed as they are processed */
ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
if (ptr == NULL)
GOTO(out, rc =-EFAULT);
- *cur_idx = body->lgd_saved_index;
- *cur_offset = body->lgd_cur_offset;
-
memcpy(buf, ptr, len);
EXIT;
out: