X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=898180c013a4845481bbfd48782fa9168f8e9048;hb=04d57a4d05ce0a0f8d16c32d14d056e312527808;hp=d0126453122f7df011240090f6f3885880eb2ede;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7;p=paraslash.git

diff --git a/vss.c b/vss.c
index d0126453..898180c0 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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)