From owner-svn-src-stable@freebsd.org  Sat Aug  1 22:56:43 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 33AF09B09BC;
 Sat,  1 Aug 2015 22:56:43 +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 2043FDB7;
 Sat,  1 Aug 2015 22:56:43 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t71Mugcj083984;
 Sat, 1 Aug 2015 22:56:42 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t71MugPi083983;
 Sat, 1 Aug 2015 22:56:42 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201508012256.t71MugPi083983@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: Sat, 1 Aug 2015 22:56:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r286164 - stable/10/sys/fs/nfsserver
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Aug 2015 22:56:43 -0000

Author: rmacklem
Date: Sat Aug  1 22:56:42 2015
New Revision: 286164
URL: https://svnweb.freebsd.org/changeset/base/286164

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/10/sys/fs/nfsserver/nfs_nfsdstate.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- stable/10/sys/fs/nfsserver/nfs_nfsdstate.c	Sat Aug  1 22:00:25 2015	(r286163)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdstate.c	Sat Aug  1 22:56:42 2015	(r286164)
@@ -225,7 +225,8 @@ nfsrv_setclient(struct nfsrv_descript *n
 			break;
 		}
 	    }
-	    i++;
+	    if (gotit == 0)
+		i++;
 	}
 	if (!gotit ||
 	    (clp->lc_flags & (LCL_NEEDSCONFIRM | LCL_ADMINREVOKED))) {