From owner-svn-src-all@FreeBSD.ORG  Tue Feb 15 20:53:01 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB807106564A;
	Tue, 15 Feb 2011 20:53:01 +0000 (UTC)
	(envelope-from zack@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B9EB88FC16;
	Tue, 15 Feb 2011 20:53:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1FKr1uc044027;
	Tue, 15 Feb 2011 20:53:01 GMT (envelope-from zack@svn.freebsd.org)
Received: (from zack@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1FKr1Go044025;
	Tue, 15 Feb 2011 20:53:01 GMT (envelope-from zack@svn.freebsd.org)
Message-Id: <201102152053.p1FKr1Go044025@svn.freebsd.org>
From: Zack Kirsch <zack@FreeBSD.org>
Date: Tue, 15 Feb 2011 20:53:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218715 - stable/8/sys/fs/nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Feb 2011 20:53:01 -0000

Author: zack
Date: Tue Feb 15 20:53:01 2011
New Revision: 218715
URL: http://svn.freebsd.org/changeset/base/218715

Log:
  MFC: 217336
  In the experimental NFS server, when converting an open-owner to a lock-owner,
  start at sequence id 1 instead of 0, to match up with both Solaris and Linux.

Modified:
  stable/8/sys/fs/nfsserver/nfs_nfsdstate.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdstate.c	Tue Feb 15 20:46:51 2011	(r218714)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdstate.c	Tue Feb 15 20:53:01 2011	(r218715)
@@ -1922,7 +1922,7 @@ tryagain:
 		 */
 		new_stp->ls_seq = new_stp->ls_opentolockseq;
 		nfsrvd_refcache(new_stp->ls_op);
-		stateidp->seqid = new_stp->ls_stateid.seqid = 0;
+		stateidp->seqid = new_stp->ls_stateid.seqid = 1;
 		stateidp->other[0] = new_stp->ls_stateid.other[0] =
 		    clp->lc_clientid.lval[0];
 		stateidp->other[1] = new_stp->ls_stateid.other[1] =