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 2009-01-09 15:11:59 -08:00
parent f542baed20 8f4340d3e8
commit 3a0cbd79a8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libzpool/Makefile.am
View File

@ -53,7 +53,6 @@ libzpool_la_SOURCES = \
${top_srcdir}/module/zfs/lzjb.c \ ${top_srcdir}/module/zfs/lzjb.c \
${top_srcdir}/module/zfs/metaslab.c \ ${top_srcdir}/module/zfs/metaslab.c \
${top_srcdir}/module/zfs/refcount.c \ ${top_srcdir}/module/zfs/refcount.c \
${top_srcdir}/module/zfs/rrwlock.c \
${top_srcdir}/module/zfs/sha256.c \ ${top_srcdir}/module/zfs/sha256.c \
${top_srcdir}/module/zfs/spa.c \ ${top_srcdir}/module/zfs/spa.c \
${top_srcdir}/module/zfs/spa_boot.c \ ${top_srcdir}/module/zfs/spa_boot.c \

3
module/zfs/rrwlock.c
View File

@ -23,6 +23,8 @@
* Use is subject to license terms. * Use is subject to license terms.
*/ */
#ifdef HAVE_ZPL
#pragma ident "%Z%%M% %I% %E% SMI" #pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/refcount.h> #include <sys/refcount.h>
@ -247,3 +249,4 @@ rrw_held(rrwlock_t *rrl, krw_t rw)
return (held); return (held);
} }
#endif /* HAVE_ZPL */