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:35:16 -08:00
parent 3bbcf6eae6 9d731b801b
commit c099989076
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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,5 @@ rrw_held(rrwlock_t *rrl, krw_t rw)
return (held); return (held);
} }
#endif /* HAVE_ZPL */

4
module/zfs/spa_boot.c
View File

@ -24,6 +24,8 @@
* Use is subject to license terms. * Use is subject to license terms.
*/ */
#ifdef _KERNEL
#pragma ident "%Z%%M% %I% %E% SMI" #pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/spa.h> #include <sys/spa.h>
@ -45,3 +47,5 @@ spa_free_bootprop(char *value)
{ {
ddi_prop_free(value); ddi_prop_free(value);
} }
#endif /* _KERNEL */

2
module/zfs/vdev_disk.c
View File

@ -656,6 +656,4 @@ vdev_ops_t vdev_disk_ops = {
B_TRUE /* leaf vdev */ B_TRUE /* leaf vdev */
}; };
#else
#error "vdev_disk.c is only required for an in-kernel builds"
#endif /* _KERNEL */ #endif /* _KERNEL */