This implements a suggestion by Keir to remove the xenbus "ignore
state transitions on shutdown" code for kernels without a shutdown
callback.
Signed-off-by: David Lively <dlively@xxxxxxxxxxxxxxx>
Signed-off-by: Ben Guthro <bguthro@xxxxxxxxxxxxxxx>
diff -r 138bfca44447 drivers/xen/xenbus/xenbus_probe.c
--- a/drivers/xen/xenbus/xenbus_probe.c Wed Jun 27 11:54:55 2007 -0400
+++ b/drivers/xen/xenbus/xenbus_probe.c Wed Jun 27 11:54:58 2007 -0400
@@ -208,6 +208,7 @@ static void otherend_changed(struct xenb
DPRINTK("state is %d (%s), %s, %s", state, xenbus_strstate(state),
dev->otherend_watch.node, vec[XS_WATCH_PATH]);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
/*
* Ignore xenbus transitions during shutdown. This prevents us doing
* work that can fail e.g., when the rootfs is gone.
@@ -221,6 +222,7 @@ static void otherend_changed(struct xenb
xenbus_frontend_closed(dev);
return;
}
+#endif
if (drv->otherend_changed)
drv->otherend_changed(dev, state);
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|