Module Name: src
Committed By: snj
Date: Fri Oct 16 07:04:37 UTC 2009
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: xbdback_xenbus.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1093):
sys/arch/xen/xen/xbdback_xenbus.c: revision 1.26
Don't pass a NULL arg to DIOCCACHESYNC, sd(4) dereferences it.
Pass a pointer to a int initialized to 1, so that a DIOCCACHESYNC will be
forced on sd(4).
Should fix dom0 panic reported by Sarton O'Brien.
To generate a diff of this commit:
cvs rdiff -u -r1.20.4.1 -r1.20.4.2 src/sys/arch/xen/xen/xbdback_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.1 src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.2
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.1 Mon Sep 28 01:25:22 2009
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Fri Oct 16 07:04:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.20.4.1 2009/09/28 01:25:22 snj Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.20.4.2 2009/10/16 07:04:37 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.20.4.1 2009/09/28 01:25:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.20.4.2 2009/10/16 07:04:37 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1313,9 +1313,10 @@
if (xbd_io->xio_operation == BLKIF_OP_FLUSH_DISKCACHE) {
int error;
+ int force = 1;
struct xbdback_instance *xbdi = xbd_io->xio_xbdi;
- error = VOP_IOCTL(xbdi->xbdi_vp, DIOCCACHESYNC, NULL, FWRITE,
+ error = VOP_IOCTL(xbdi->xbdi_vp, DIOCCACHESYNC, &force, FWRITE,
kauth_cred_get());
if (error) {
aprint_error("xbdback %s: DIOCCACHESYNC returned %d\n",
