svn commit: r333231 - projects/pnfs-planb-server/sys/fs/nfsserver

[Rick Macklem]

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;