From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Sat, 9 Jan 2010 17:26:41 +0000 (-0700)
Subject: mountd: simplify export list deferral in v4root_set
X-Git-Tag: nfs-utils-1-2-2-rc6~3
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=40af0d2957a168bee50337695379313f3f88c635;p=nfs-utils.git

mountd: simplify export list deferral in v4root_set

We're adding new entries, but not deleting them, so we don't need to do
the usual double-counter trick here.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
index b0a10c8..ac800b3 100644
--- a/utils/mountd/v4root.c
+++ b/utils/mountd/v4root.c
@@ -147,7 +147,7 @@ int pseudofs_update(char *hostname, char *path, nfs_export *source)
 void
 v4root_set()
 {
-	nfs_export	*exp, *nxt;
+	nfs_export	*exp;
 	int	i;
 	char *path, *ptr;
 	char *hostname;
@@ -158,8 +158,7 @@ v4root_set()
 		return;
 
 	for (i = 0; i < MCL_MAXTYPES; i++) {
-		for (exp = exportlist[i].p_head; exp; exp = nxt) {
-			nxt = exp->m_next;
+		for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
 			hostname = exp->m_export.e_hostname;
 
 			if (exp->m_export.e_flags & NFSEXP_V4ROOT)