X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fllog_client.c;h=a39db55028dc5b50588585c0821d04b01bf4cf6f;hb=9321c8a3de6fe26b30a6eeac423e0407a8b1c564;hp=e096e1597c8df105d1f34e86d6fe066c23dd40b2;hpb=91ef75669c7e41091378a8401ca0c093b7f17174;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/llog_client.c b/lustre/ptlrpc/llog_client.c
index e096e15..a39db55 100644
--- a/lustre/ptlrpc/llog_client.c
+++ b/lustre/ptlrpc/llog_client.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
  */
@@ -206,21 +202,36 @@ static int llog_client_next_block(const struct lu_env *env,
         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: