D3725.id8914.diff
No OneTemporary
Actions

Size

711 B

Referenced Files

None

Subscribers

None

D3725.id8914.diff
View Options

	Index: head/sys/geom/geom_dev.c
	===================================================================
	--- head/sys/geom/geom_dev.c
	+++ head/sys/geom/geom_dev.c
	@@ -124,6 +124,7 @@
	{

	freeenv(dumpdev);
	+ dumpdev = NULL;
	}

	static int
	@@ -152,10 +153,16 @@
	static void
	init_dumpdev(struct cdev *dev)
	{
	+ const char devprefix = "/dev/", devname;
	+ size_t len;

	if (dumpdev == NULL)
	return;
	- if (strcmp(devtoname(dev), dumpdev) != 0)
	+ len = strlen(devprefix);
	+ devname = devtoname(dev);
	+ if (strcmp(devname, dumpdev) != 0 &&
	+ (strncmp(dumpdev, devprefix, len) != 0 \|\|
	+ strcmp(devname, dumpdev + len) != 0))
	return;
	if (g_dev_setdumpdev(dev, curthread) == 0) {
	freeenv(dumpdev);