Module Name: src
Committed By: jdolecek
Date: Wed Oct 16 19:38:13 UTC 2019
Modified Files:
src/sys/arch/xen/xen: xbd_xenbus.c
Log Message:
don't try to read disklabel for attached xbd* disk from (effectively) always
xbd0a device, there is no need for it and it is just wrong
same problem as PR kern/41704 for cgd
XXX perhaps xbd should use native block size passed from dom0 rather then
XXX recomputing in DEV_BSIZE
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/xen/xen/xbd_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/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.92 src/sys/arch/xen/xen/xbd_xenbus.c:1.93
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.92 Sat Feb 2 12:32:55 2019
+++ src/sys/arch/xen/xen/xbd_xenbus.c Wed Oct 16 19:38:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.92 2019/02/02 12:32:55 cherry Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.93 2019/10/16 19:38:13 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.92 2019/02/02 12:32:55 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.93 2019/10/16 19:38:13 jdolecek Exp $");
#include "opt_xen.h"
@@ -587,12 +587,11 @@ xbd_backend_changed(void *arg, XenbusSta
sc->sc_backend_status = BLKIF_STATE_CONNECTED;
- /* try to read the disklabel */
- dk_getdisklabel(&sc->sc_dksc, 0 /* XXX ? */);
format_bytes(buf, sizeof(buf), sc->sc_sectors * sc->sc_secsize);
aprint_verbose_dev(sc->sc_dksc.sc_dev,
"%s, %d bytes/sect x %" PRIu64 " sectors\n",
buf, (int)dg->dg_secsize, sc->sc_xbdsize);
+
/* Discover wedges on this disk. */
dkwedge_discover(&sc->sc_dksc.sc_dkdev);
