Attachment #247382 for bug #276039

View | Details | Raw Unified | Return to bug 276039
Collapse All | Expand All




	return (spa_taskq_param_get(ZIO_TYPE_WRITE, buf));
}
#else
#include <sys/sbuf.h>

/*
 * On FreeBSD load-time parameters can be set up before malloc() is available,
 * so we have to do all the parsing work on the stack.

spa_taskq_read_param(ZFS_MODULE_PARAM_ARGS)
{
	char buf[SPA_TASKQ_PARAM_MAX];
	int err;

	if (req->newptr == NULL) {
		int len = spa_taskq_param_get(ZIO_TYPE_READ, buf);
		struct sbuf *s = sbuf_new_for_sysctl(NULL, NULL, len+1, req);
		sbuf_cpy(s, buf);
		err = sbuf_finish(s);
		sbuf_delete(s);
		return (err);
	}

	(void) spa_taskq_param_get(ZIO_TYPE_READ, buf);
	err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
	if (err || req->newptr == NULL)
		return (err);
	return (spa_taskq_param_set(ZIO_TYPE_READ, buf));
}

spa_taskq_write_param(ZFS_MODULE_PARAM_ARGS)
{
	char buf[SPA_TASKQ_PARAM_MAX];
	int err;

	if (req->newptr == NULL) {
		int len = spa_taskq_param_get(ZIO_TYPE_WRITE, buf);
		struct sbuf *s = sbuf_new_for_sysctl(NULL, NULL, len+1, req);
		sbuf_cpy(s, buf);
		err = sbuf_finish(s);
		sbuf_delete(s);
		return (err);
	}

	(void) spa_taskq_param_get(ZIO_TYPE_WRITE, buf);
	err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
	if (err || req->newptr == NULL)
		return (err);
	return (spa_taskq_param_set(ZIO_TYPE_WRITE, buf));
}

Return to bug 276039

Lines 1445-1452 spa_taskq_write_param_get(char buf, zfs_kernel_param_t kp) Link Here

(-)b/sys/contrib/openzfs/module/zfs/spa.c (-24 / +6 lines)
1445	return (spa_taskq_param_get(ZIO_TYPE_WRITE, buf));	1445	return (spa_taskq_param_get(ZIO_TYPE_WRITE, buf));
1446	}	1446	}
1447	#else	1447	#else
1448	#include <sys/sbuf.h>
1449
1450	/*	1448	/*
1451	* On FreeBSD load-time parameters can be set up before malloc() is available,	1449	* On FreeBSD load-time parameters can be set up before malloc() is available,
1452	* so we have to do all the parsing work on the stack.	1450	* so we have to do all the parsing work on the stack.
Lines 1457-1475 static int Link Here
1457	spa_taskq_read_param(ZFS_MODULE_PARAM_ARGS)	1455	spa_taskq_read_param(ZFS_MODULE_PARAM_ARGS)
1458	{	1456	{
1459	char buf[SPA_TASKQ_PARAM_MAX];	1457	char buf[SPA_TASKQ_PARAM_MAX];
1460	int err = 0;	1458	int err;
1461
1462	if (req->newptr == NULL) {
1463	int len = spa_taskq_param_get(ZIO_TYPE_READ, buf);
1464	struct sbuf *s = sbuf_new_for_sysctl(NULL, NULL, len+1, req);
1465	sbuf_cpy(s, buf);
1466	err = sbuf_finish(s);
1467	sbuf_delete(s);
1468	return (err);
1469	}
1470		1459
		1460	(void) spa_taskq_param_get(ZIO_TYPE_READ, buf);
1471	err = sysctl_handle_string(oidp, buf, sizeof (buf), req);	1461	err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
1472	if (err)	1462	if (err \|\| req->newptr == NULL)
1473	return (err);	1463	return (err);
1474	return (spa_taskq_param_set(ZIO_TYPE_READ, buf));	1464	return (spa_taskq_param_set(ZIO_TYPE_READ, buf));
1475	}	1465	}
Lines 1478-1496 static int Link Here
1478	spa_taskq_write_param(ZFS_MODULE_PARAM_ARGS)	1468	spa_taskq_write_param(ZFS_MODULE_PARAM_ARGS)
1479	{	1469	{
1480	char buf[SPA_TASKQ_PARAM_MAX];	1470	char buf[SPA_TASKQ_PARAM_MAX];
1481	int err = 0;	1471	int err;
1482
1483	if (req->newptr == NULL) {
1484	int len = spa_taskq_param_get(ZIO_TYPE_WRITE, buf);
1485	struct sbuf *s = sbuf_new_for_sysctl(NULL, NULL, len+1, req);
1486	sbuf_cpy(s, buf);
1487	err = sbuf_finish(s);
1488	sbuf_delete(s);
1489	return (err);
1490	}
1491		1472
		1473	(void) spa_taskq_param_get(ZIO_TYPE_WRITE, buf);
1492	err = sysctl_handle_string(oidp, buf, sizeof (buf), req);	1474	err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
1493	if (err)	1475	if (err \|\| req->newptr == NULL)
1494	return (err);	1476	return (err);
1495	return (spa_taskq_param_set(ZIO_TYPE_WRITE, buf));	1477	return (spa_taskq_param_set(ZIO_TYPE_WRITE, buf));
1496	}	1478	}