diff options
| author | delphij <delphij@FreeBSD.org> | 2014-11-09 07:37:00 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-11-09 07:37:00 +0000 |
| commit | 0d7beefb910ec2b91d59cdbd90c0073e466f36c4 (patch) | |
| tree | c2d93ba0784d510ba474f4f3a074858f2f3156d3 /cddl | |
| parent | ce17e1128b9651166225d52c6f3a52b89a048716 (diff) | |
| download | FreeBSD-src-0d7beefb910ec2b91d59cdbd90c0073e466f36c4.zip FreeBSD-src-0d7beefb910ec2b91d59cdbd90c0073e466f36c4.tar.gz | |
MFV r274272 and diff reduction with upstream.
Illumos issue:
5244 zio pipeline callers should explicitly invoke next stage
Tested with: ztest plus ZFS over GELI configuration
MFC after: 1 month
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzpool/common/taskq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c b/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c index 785f106..26d9f36 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c +++ b/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c @@ -25,6 +25,7 @@ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ #include <sys/zfs_context.h> @@ -33,8 +34,10 @@ int taskq_now; taskq_t *system_taskq; #define TASKQ_ACTIVE 0x00010000 +#define TASKQ_NAMELEN 31 struct taskq { + char tq_name[TASKQ_NAMELEN + 1]; kmutex_t tq_lock; krwlock_t tq_threadlock; kcondvar_t tq_dispatch_cv; @@ -247,6 +250,7 @@ taskq_create(const char *name, int nthreads, pri_t pri, cv_init(&tq->tq_dispatch_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_wait_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_maxalloc_cv, NULL, CV_DEFAULT, NULL); + (void) strncpy(tq->tq_name, name, TASKQ_NAMELEN + 1); tq->tq_flags = flags | TASKQ_ACTIVE; tq->tq_active = nthreads; tq->tq_nthreads = nthreads; |
