From owner-svn-src-projects@FreeBSD.ORG  Thu Feb  2 04:20:33 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9648106564A;
	Thu,  2 Feb 2012 04:20:33 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C87B18FC08;
	Thu,  2 Feb 2012 04:20:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q124KXqh018926;
	Thu, 2 Feb 2012 04:20:33 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q124KXkj018923;
	Thu, 2 Feb 2012 04:20:33 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201202020420.q124KXkj018923@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 2 Feb 2012 04:20:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230899 - in projects/nfsv4.1-client/sys/fs: nfs
	nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Feb 2012 04:20:33 -0000

Author: rmacklem
Date: Thu Feb  2 04:20:33 2012
New Revision: 230899
URL: http://svn.freebsd.org/changeset/base/230899

Log:
  Add a flag to nfsm_stateidtom() so that it will put the stateid
  on the wire with a seqid == 0. This is needed for NFSv4.1, where
  stateid.seqid == 0 defines the stateid as the most recent
  incarnation of the stateid.

Modified:
  projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h	Thu Feb  2 00:10:20 2012	(r230898)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h	Thu Feb  2 04:20:33 2012	(r230899)
@@ -468,6 +468,7 @@
 #define	NFSSTATEID_PUTALLZERO		0
 #define	NFSSTATEID_PUTALLONE		1
 #define	NFSSTATEID_PUTSTATEID		2
+#define	NFSSTATEID_PUTSEQIDZERO		3
 
 /*
  * Bits for share access and deny.

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c	Thu Feb  2 00:10:20 2012	(r230898)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c	Thu Feb  2 04:20:33 2012	(r230899)
@@ -496,6 +496,11 @@ nfsm_stateidtom(struct nfsrv_descript *n
 		st->other[0] = 0xffffffff;
 		st->other[1] = 0xffffffff;
 		st->other[2] = 0xffffffff;
+	} else if (flag == NFSSTATEID_PUTSEQIDZERO) {
+		st->seqid = 0;
+		st->other[0] = stateidp->other[0];
+		st->other[1] = stateidp->other[1];
+		st->other[2] = stateidp->other[2];
 	} else {
 		st->seqid = stateidp->seqid;
 		st->other[0] = stateidp->other[0];