svn commit: r286046 - head/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Wed Jul 29 23:06:30 2015
New Revision: 286046
URL: https://svnweb.freebsd.org/changeset/base/286046

Log:
  This patch fixes a problem where, if the NFSv4 server has a previous
  unconfirmed clientid structure for the same client on the last hash list,
  this old entry would not be removed/deleted. I do not think this bug would have
  caused serious problems, since the new entry would have been before the old one
  on the list. This old entry would have eventually been scavenged/removed.
  Detected while reading the code looking for another bug.
  
  MFC after:	3 days

Modified:
  head/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c	Wed Jul 29 22:51:54 2015	(r286045)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c	Wed Jul 29 23:06:30 2015	(r286046)
@@ -220,7 +220,8 @@ nfsrv_setclient(struct nfsrv_descript *n
 			break;
 		}
 	    }
-	    i++;
+	    if (gotit == 0)
+		i++;
 	}
 	if (!gotit ||
 	    (clp->lc_flags & (LCL_NEEDSCONFIRM | LCL_ADMINREVOKED))) {