From owner-svn-src-projects@freebsd.org  Thu May  3 23:51:10 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24DFAFC036B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu,  3 May 2018 23:51:10 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C8D9A87444;
 Thu,  3 May 2018 23:51:09 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3B9F26D47;
 Thu,  3 May 2018 23:51:09 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w43Np9Oh002384;
 Thu, 3 May 2018 23:51:09 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w43Np9lI002383;
 Thu, 3 May 2018 23:51:09 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201805032351.w43Np9lI002383@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: Thu, 3 May 2018 23:51:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r333231 - projects/pnfs-planb-server/sys/fs/nfsserver
X-SVN-Group: projects
X-SVN-Commit-Author: rmacklem
X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfsserver
X-SVN-Commit-Revision: 333231
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 May 2018 23:51:10 -0000

Author: rmacklem
Date: Thu May  3 23:51:09 2018
New Revision: 333231
URL: https://svnweb.freebsd.org/changeset/base/333231

Log:
  Add a check for same layout stateid to the layout return operation.

Modified:
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c	Thu May  3 22:51:44 2018	(r333230)
+++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c	Thu May  3 23:51:09 2018	(r333231)
@@ -6701,7 +6701,13 @@ nfsrv_layoutreturn(struct nfsrv_descript *nd, vnode_t 
 				if (NFSBCMP(&lyp->lay_fh, &fh,
 				    sizeof(fh)) == 0 &&
 				    lyp->lay_clientid.qval ==
-				    nd->nd_clientid.qval) {
+				    nd->nd_clientid.qval &&
+				    stateidp->other[0] ==
+				    lyp->lay_stateid.other[0] &&
+				    stateidp->other[1] ==
+				    lyp->lay_stateid.other[1] &&
+				    stateidp->other[2] ==
+				    lyp->lay_stateid.other[2]) {
 					lyp->lay_flags |= NFSLAY_RETURNED;
 					wakeup(lyp);
 					error = 0;