Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-22 13:51:21 -08:00
parent 9d731b801b 4251330f28
commit 05fafc638f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libzpool/include/sys/zfs_context.h
View File

@ -149,9 +149,9 @@ extern void vpanic(const char *, __va_list);
/* /*
* Threads * Threads
*/ */
#define curthread ((void *)(uintptr_t)pthread_self())
/* XXX: not portable */ #define tsd_get(key) pthread_getspecific(key)
#define curthread ((void *)(uintptr_t)pthread_self()) #define tsd_set(key, val) pthread_setspecific(key, val)
typedef struct kthread kthread_t; typedef struct kthread kthread_t;
typedef void (*thread_func_t)(void *); typedef void (*thread_func_t)(void *);

2
module/zfs/rrwlock.c
View File

@ -120,7 +120,7 @@ rrn_find_and_remove(rrwlock_t *rrl)
rrw_node_t *prev = NULL; rrw_node_t *prev = NULL;
if (refcount_count(&rrl->rr_linked_rcount) == 0) if (refcount_count(&rrl->rr_linked_rcount) == 0)
return (NULL); return (B_FALSE);
for (rn = tsd_get(rrw_tsd_key); rn != NULL; rn = rn->rn_next) { for (rn = tsd_get(rrw_tsd_key); rn != NULL; rn = rn->rn_next) {
if (rn->rn_rrl == rrl) { if (rn->rn_rrl == rrl) {