From owner-svn-src-all@FreeBSD.ORG  Wed Jan 12 23:46:12 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 8EA61106566B;
	Wed, 12 Jan 2011 23:46:12 +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 7E64C8FC08;
	Wed, 12 Jan 2011 23:46:12 +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 p0CNkCPG026802;
	Wed, 12 Jan 2011 23:46:12 GMT (envelope-from zack@svn.freebsd.org)
Received: (from zack@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0CNkCgW026800;
	Wed, 12 Jan 2011 23:46:12 GMT (envelope-from zack@svn.freebsd.org)
Message-Id: <201101122346.p0CNkCgW026800@svn.freebsd.org>
From: Zack Kirsch <zack@FreeBSD.org>
Date: Wed, 12 Jan 2011 23:46:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217336 - head/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: Wed, 12 Jan 2011 23:46:12 -0000

Author: zack
Date: Wed Jan 12 23:46:12 2011
New Revision: 217336
URL: http://svn.freebsd.org/changeset/base/217336

Log:
  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.
  
  Reviewed by:    rmacklem
  Approved by:    zml (mentor)

Modified:
  head/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c	Wed Jan 12 23:34:09 2011	(r217335)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c	Wed Jan 12 23:46:12 2011	(r217336)
@@ -1921,7 +1921,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] =