svn commit: r204046 - stable/8/sys/fs/nfsserver

Rick Macklem rmacklem at FreeBSD.org
Thu Feb 18 16:23:14 UTC 2010


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);


More information about the svn-src-stable-8 mailing list