summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjimharris <jimharris@FreeBSD.org>2013-01-07 21:35:25 +0000
committerjimharris <jimharris@FreeBSD.org>2013-01-07 21:35:25 +0000
commitece1c1fcc9752445fcf46db735f5351960e7ea9a (patch)
treee3317d06aabf56ebeb1f9ac9581a3c6be1f51ec9
parentf7a4165c518f6bbbc49b58d2ae0297ae5c2433a9 (diff)
downloadFreeBSD-src-ece1c1fcc9752445fcf46db735f5351960e7ea9a.zip
FreeBSD-src-ece1c1fcc9752445fcf46db735f5351960e7ea9a.tar.gz
Revert r244549.
This change was originally intended to account for test kthreads under the nvmecontrol process, but jhb indicated it may not be safe to associate kthreads with userland processes and this could have unintended consequences. I did not observe any problems with this change, but my testing didn't exhaust the kinds of corner cases that could cause problems. It is not that important to account for these test threads under nvmecontrol, so I am just reverting this change for now. On a related note, the part of this patch for <= 7.x fails compilation so reverting this fixes that too. Suggested by: jhb
-rw-r--r--sys/dev/nvme/nvme_test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/nvme/nvme_test.c b/sys/dev/nvme/nvme_test.c
index 3d04ea5..4177227 100644
--- a/sys/dev/nvme/nvme_test.c
+++ b/sys/dev/nvme/nvme_test.c
@@ -287,10 +287,10 @@ nvme_ns_test(struct nvme_namespace *ns, u_long cmd, caddr_t arg)
for (i = 0; i < io_test->num_threads; i++)
#if __FreeBSD_version >= 800004
kthread_add(fn, io_test_internal,
- curproc, NULL, 0, 0, "nvme_io_test[%d]", i);
+ NULL, NULL, 0, 0, "nvme_io_test[%d]", i);
#else
kthread_create(fn, io_test_internal,
- curproc, 0, 0, "nvme_io_test[%d]", i);
+ NULL, 0, 0, "nvme_io_test[%d]", i);
#endif
tsleep(io_test_internal, 0, "nvme_test", io_test->time * 2 * hz);
OpenPOWER on IntegriCloud