D21034.id60050.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21034.id60050.diff
View Options

	Index: sbin/swapon/swapon.c
	===================================================================
	--- sbin/swapon/swapon.c
	+++ sbin/swapon/swapon.c
	@@ -746,9 +746,11 @@
	off_t ioarg[2], sz;
	int error, fd;

	+ /* Open a connection to create a consumer of the device. */
	fd = open(name, O_WRONLY);
	if (fd < 0)
	errx(1, "Cannot open %s", name);
	+ /* Find the device size. */
	if (fstat(fd, &sb) < 0)
	errx(1, "Cannot stat %s", name);
	if (S_ISREG(sb.st_mode))
	@@ -758,18 +760,22 @@
	err(1, "ioctl(DIOCGMEDIASIZE)");
	} else
	errx(1, "%s has an invalid file type", name);
	+ /* Trim the device. */
	ioarg[0] = 0;
	ioarg[1] = sz;
	if (ioctl(fd, DIOCGDELETE, ioarg) != 0)
	warn("ioctl(DIOCGDELETE)");

	+ /* Start using the device for swapping, creating a second consumer. */
	+ error = swapon(name);
	+
	/*
	- * swapon is invoked after trimming, so that the trimming doesn't happen
	- * after the device is in use for swapping, but before the fd is closed,
	- * for the benefit of geli, which could otherwise detach the device,
	- * before swapon, on close.
	+ * Do not close the device until the swap pager has attempted to create
	+ * another consumer. For GELI devices created with the 'detach -l'
	+ * option, removing the last consumer causes the device to be detached
	+ * - that is, to disappear. This ordering ensures that the device will
	+ * not be detached until swapoff is called.
	*/
	- error = swapon(name);
	close(fd);
	return (error);
	}