From owner-svn-src-all@FreeBSD.ORG  Thu Feb 18 16:23:14 2010
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 59B691065694;
	Thu, 18 Feb 2010 16:23:14 +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 48DBE8FC15;
	Thu, 18 Feb 2010 16:23:14 +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 o1IGNElF015784;
	Thu, 18 Feb 2010 16:23:14 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1IGNEqB015782;
	Thu, 18 Feb 2010 16:23:14 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201002181623.o1IGNEqB015782@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 18 Feb 2010 16:23:14 +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: r204046 - 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: Thu, 18 Feb 2010 16:23:14 -0000

Author: rmacklem
Date: Thu Feb 18 16:23:13 2010
New Revision: 204046
URL: http://svn.freebsd.org/changeset/base/204046

Log:
  MFC: r203848
  This fixes the experimental NFS server so that it won't crash in the
  caching code for IPv6 by fixing a typo that used the incorrect variable.
  It also fixes the indentation of the statement above it.
  
  Reported by:	simon AT comsys.ntu-kpi.kiev.ua

Modified:
  stable/8/sys/fs/nfsserver/nfs_nfsdcache.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)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdcache.c	Thu Feb 18 16:05:09 2010	(r204045)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdcache.c	Thu Feb 18 16:23:13 2010	(r204046)
@@ -386,9 +386,9 @@ loop:
 		newrp->rc_inet = saddr->sin_addr.s_addr;
 	else if (saddr->sin_family == AF_INET6) {
 		saddr6 = (struct sockaddr_in6 *)saddr;
-		NFSBCOPY((caddr_t)&saddr6->sin6_addr,(caddr_t)&newrp->rc_inet6,
-			sizeof (struct in6_addr));
-		rp->rc_flag |= RC_INETIPV6;
+		NFSBCOPY((caddr_t)&saddr6->sin6_addr, (caddr_t)&newrp->rc_inet6,
+		    sizeof (struct in6_addr));
+		newrp->rc_flag |= RC_INETIPV6;
 	}
 	LIST_INSERT_HEAD(hp, newrp, rc_hash);
 	TAILQ_INSERT_TAIL(&nfsrvudplru, newrp, rc_lru);