From: Andre Noll <maan@systemlinux.org>
Date: Thu, 6 May 2010 05:48:44 +0000 (+0200)
Subject: vss: Don't treat EAGAIN as an error when reading from the afs pipe.
X-Git-Tag: v0.4.3~25^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=15166c2d894212e8d326e7088d11c98c95c4fc06

vss: Don't treat EAGAIN as an error when reading from the afs pipe.
---

diff --git a/vss.c b/vss.c
index bfb0f0a1..898180c0 100644
--- a/vss.c
+++ b/vss.c
@@ -781,16 +781,20 @@ static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data)
 	return 1;
 }
 
-static void recv_afs_result(struct vss_task *vsst)
+static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
 {
 	int ret, passed_fd, shmid;
 	uint32_t afs_code = 0, afs_data = 0;
 	struct stat statbuf;
 
-	vsst->afsss = AFS_SOCKET_READY;
+	if (!FD_ISSET(vsst->afs_socket, rfds))
+		return;
 	ret = recv_afs_msg(vsst->afs_socket, &passed_fd, &afs_code, &afs_data);
+	if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
+		return;
 	if (ret < 0)
 		goto err;
+	vsst->afsss = AFS_SOCKET_READY;
 	PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code,
 		afs_data);
 	ret = -E_NOFD;
@@ -920,10 +924,9 @@ static void vss_post_select(struct sched *s, struct task *t)
 			senders[sender_num].client_cmds[num](&mmd->sender_cmd_data);
 		mmd->sender_cmd_data.cmd_num = -1;
 	}
-	if (vsst->afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
-		if (FD_ISSET(vsst->afs_socket, &s->rfds))
-			recv_afs_result(vsst);
-	} else if (FD_ISSET(vsst->afs_socket, &s->wfds)) {
+	if (vsst->afsss != AFS_SOCKET_CHECK_FOR_WRITE)
+		recv_afs_result(vsst, &s->rfds);
+	else if (FD_ISSET(vsst->afs_socket, &s->wfds)) {
 		PARA_NOTICE_LOG("requesting new fd from afs\n");
 		ret = send_buffer(vsst->afs_socket, "new");
 		if (ret < 0)