diff options
| author | Denys Rtveliashvili <[email protected]> | 2016-05-15 22:18:25 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-05-15 15:18:25 -0700 |
| commit | 206971d234431e7599249a2688c4fcea5395acb0 (patch) | |
| tree | b91598c59e8fdbfcca4addfd95e9bd9ec1c63dc1 /include/sys/zfs_context.h | |
| parent | dabe1c42f9724ab030dea7fc1db1c924d21a8a6a (diff) | |
OpenZFS 6739 - assumption in cv_timedwait_hires
Userland version of cv_timedwait_hires() always assumes absolute time.
Reviewed by: Paul Dagnelie <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Reviewed by: Robert Mustacchi <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Ported by: Denys Rtveliashvili <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/6739
OpenZFS-commit: https://github.com/illumos/illumos-gate/commit/41c6413
Porting Notes:
The ported change has revealed a number of problems in the Linux-specific code,
as it was expecting incorrect return codes from pthread_* functions.
Reviewed and improved the usage of pthread_* function in lib/libzpool/kernel.c.
Diffstat (limited to 'include/sys/zfs_context.h')
| -rw-r--r-- | include/sys/zfs_context.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index 6ba580339..fc15d7042 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -25,7 +25,7 @@ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. */ #ifndef _SYS_ZFS_CONTEXT_H @@ -353,6 +353,7 @@ typedef struct kcondvar { } kcondvar_t; #define CV_DEFAULT 0 +#define CALLOUT_FLAG_ABSOLUTE 0x2 extern void cv_init(kcondvar_t *cv, char *name, int type, void *arg); extern void cv_destroy(kcondvar_t *cv); |