From: Huawei Xie <huawei.xie@intel.com>
Date: Fri, 6 Mar 2015 05:52:43 +0000 (+0800)
Subject: vhost: use loop instead of goto
X-Git-Tag: spdx-start~9481
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=aee87dd706bcb3e95ef721b79915c84ca31901e8;p=dpdk.git

vhost: use loop instead of goto

This patch reorder the code a bit to use loop instead of goto.
Besides, remove abudant check 'fd != -1'.

Signed-off-by: Huawei Xie <huawei.xie@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---

diff --git a/lib/librte_vhost/vhost_user/fd_man.c b/lib/librte_vhost/vhost_user/fd_man.c
index a89b6fea18..831c9c16d1 100644
--- a/lib/librte_vhost/vhost_user/fd_man.c
+++ b/lib/librte_vhost/vhost_user/fd_man.c
@@ -172,23 +172,19 @@ fdset_del(struct fdset *pfdset, int fd)
 	if (pfdset == NULL || fd == -1)
 		return;
 
-again:
-	pthread_mutex_lock(&pfdset->fd_mutex);
+	do {
+		pthread_mutex_lock(&pfdset->fd_mutex);
 
-	i = fdset_find_fd(pfdset, fd);
-	if (i != -1 && fd != -1) {
-		/* busy indicates r/wcb is executing! */
-		if (pfdset->fd[i].busy == 1) {
-			pthread_mutex_unlock(&pfdset->fd_mutex);
-			goto again;
+		i = fdset_find_fd(pfdset, fd);
+		if (i != -1 && pfdset->fd[i].busy == 0) {
+			/* busy indicates r/wcb is executing! */
+			pfdset->fd[i].fd = -1;
+			pfdset->fd[i].rcb = pfdset->fd[i].wcb = NULL;
+			pfdset->num--;
+			i = -1;
 		}
-
-		pfdset->fd[i].fd = -1;
-		pfdset->fd[i].rcb = pfdset->fd[i].wcb = NULL;
-		pfdset->num--;
-	}
-
-	pthread_mutex_unlock(&pfdset->fd_mutex);
+		pthread_mutex_unlock(&pfdset->fd_mutex);
+	} while (i != -1);
 }
 
 /**