[src/netbsd-6]: src/sys/kern Pull up following revision(s) (requested by dsl ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0718b868537f
branches:  netbsd-6
changeset: 774190:0718b868537f
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Jun 12 17:16:28 2012 +0000

description:
Pull up following revision(s) (requested by dsl in ticket #307):
        sys/kern/vfs_bio.c: revision 1.239
Use separate temporaries for the 'int' percentage and the 'long'
  water marks.
Previous paniced on sparc64 due to a misaligned copy.

diffstat:

 sys/kern/vfs_bio.c |  28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diffs (65 lines):

diff -r 34ca852d2481 -r 0718b868537f sys/kern/vfs_bio.c
--- a/sys/kern/vfs_bio.c        Tue Jun 12 17:13:56 2012 +0000
+++ b/sys/kern/vfs_bio.c        Tue Jun 12 17:16:28 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_bio.c,v 1.236.2.1 2012/06/12 17:13:56 riz Exp $    */
+/*     $NetBSD: vfs_bio.c,v 1.236.2.2 2012/06/12 17:16:28 riz Exp $    */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.236.2.1 2012/06/12 17:13:56 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.236.2.2 2012/06/12 17:16:28 riz Exp $");
 
 #include "opt_bufcache.h"
 
@@ -1732,12 +1732,18 @@
 {
        int error, rv;
        struct sysctlnode node;
-       union u_int_long { unsigned int i; unsigned long l; } t;
+       unsigned int temp_bufcache;
+       unsigned long temp_water;
 
        /* Take a copy of the supplied node and its data */
        node = *rnode;
-       node.sysctl_data = &t;
-       t = *(union u_int_long *)rnode->sysctl_data;
+       if (node.sysctl_data == &bufcache) {
+           node.sysctl_data = &temp_bufcache;
+           temp_bufcache = *(unsigned int *)rnode->sysctl_data;
+       } else {
+           node.sysctl_data = &temp_water;
+           temp_water = *(unsigned long *)rnode->sysctl_data;
+       }
 
        /* Update the copy */
        error = sysctl_lookup(SYSCTLFN_CALL(&node));
@@ -1745,18 +1751,18 @@
                return (error);
 
        if (rnode->sysctl_data == &bufcache) {
-               if (t.i > 100)
+               if (temp_bufcache > 100)
                        return (EINVAL);
-               bufcache = t.i;
+               bufcache = temp_bufcache;
                buf_setwm();
        } else if (rnode->sysctl_data == &bufmem_lowater) {
-               if (bufmem_hiwater - t.l < 16)
+               if (bufmem_hiwater - temp_water < 16)
                        return (EINVAL);
-               bufmem_lowater = t.l;
+               bufmem_lowater = temp_water;
        } else if (rnode->sysctl_data == &bufmem_hiwater) {
-               if (t.l - bufmem_lowater < 16)
+               if (temp_water - bufmem_lowater < 16)
                        return (EINVAL);
-               bufmem_hiwater = t.l;
+               bufmem_hiwater = temp_water;
        } else
                return (EINVAL);