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

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

This commit is contained in:
Brian Behlendorf 2008-12-22 13:53:06 -08:00
parent c099989076 9de781cf03
commit 12d20ac7d3
3 changed files with 8 additions and 8 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
*/
/* XXX: not portable */
#define curthread ((void *)(uintptr_t)pthread_self())
#define curthread ((void *)(uintptr_t)pthread_self())
#define tsd_get(key) pthread_getspecific(key)
#define tsd_set(key, val) pthread_setspecific(key, val)
typedef struct kthread kthread_t;
typedef void (*thread_func_t)(void *);

6
module/zfs/rrwlock.c
View File

@ -23,8 +23,6 @@
* Use is subject to license terms.
*/
#ifdef HAVE_ZPL
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/refcount.h>
@ -120,7 +118,7 @@ rrn_find_and_remove(rrwlock_t *rrl)
rrw_node_t *prev = NULL;
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) {
if (rn->rn_rrl == rrl) {
@ -249,5 +247,3 @@ rrw_held(rrwlock_t *rrl, krw_t rw)
return (held);
}
#endif /* HAVE_ZPL */

4
module/zfs/zfs_acl.c
View File

@ -23,6 +23,8 @@
* Use is subject to license terms.
*/
#ifdef HAVE_ZPL
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
@ -2678,3 +2680,5 @@ zfs_zaccess_rename(znode_t *sdzp, znode_t *szp, znode_t *tdzp,
return (error);
}
#endif /* HAVE_ZPL */