From owner-svn-src-stable-9@freebsd.org  Sun Aug  9 22:33:52 2015
Return-Path: <owner-svn-src-stable-9@freebsd.org>
Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4240399ECA9;
 Sun,  9 Aug 2015 22:33:52 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 32EE1E17;
 Sun,  9 Aug 2015 22:33:52 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t79MXqmh074219;
 Sun, 9 Aug 2015 22:33:52 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t79MXqCU074218;
 Sun, 9 Aug 2015 22:33:52 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201508092233.t79MXqCU074218@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 9 Aug 2015 22:33:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r286560 - stable/9/sys/fs/nfsserver
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Aug 2015 22:33:52 -0000

Author: rmacklem
Date: Sun Aug  9 22:33:51 2015
New Revision: 286560
URL: https://svnweb.freebsd.org/changeset/base/286560

Log:
  MFC: r286046
  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.

Modified:
  stable/9/sys/fs/nfsserver/nfs_nfsdstate.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- stable/9/sys/fs/nfsserver/nfs_nfsdstate.c	Sun Aug  9 22:29:10 2015	(r286559)
+++ stable/9/sys/fs/nfsserver/nfs_nfsdstate.c	Sun Aug  9 22:33:51 2015	(r286560)
@@ -187,7 +187,8 @@ nfsrv_setclient(struct nfsrv_descript *n
 			break;
 		}
 	    }
-	    i++;
+	    if (gotit == 0)
+		i++;
 	}
 	if (!gotit ||
 	    (clp->lc_flags & (LCL_NEEDSCONFIRM | LCL_ADMINREVOKED))) {