From 6791a1ee34e321e78570b8189378afea4655a6f7 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Jan 2009 15:07:32 -0800 Subject: [PATCH 1/2] I don't think we need this in userspace --- lib/libzpool/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 217a5ec94a..c5be7f3418 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -53,7 +53,6 @@ libzpool_la_SOURCES = \ ${top_srcdir}/module/zfs/lzjb.c \ ${top_srcdir}/module/zfs/metaslab.c \ ${top_srcdir}/module/zfs/refcount.c \ - ${top_srcdir}/module/zfs/rrwlock.c \ ${top_srcdir}/module/zfs/sha256.c \ ${top_srcdir}/module/zfs/spa.c \ ${top_srcdir}/module/zfs/spa_boot.c \ From 39184ef9b43a8c323ff6660fea157ac43c4a5908 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Jan 2009 15:08:36 -0800 Subject: [PATCH 2/2] Only needed by ZPL --- module/zfs/rrwlock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/zfs/rrwlock.c b/module/zfs/rrwlock.c index db3b70fc68..f99a555cfb 100644 --- a/module/zfs/rrwlock.c +++ b/module/zfs/rrwlock.c @@ -23,6 +23,8 @@ * Use is subject to license terms. */ +#ifdef HAVE_ZPL + #pragma ident "%Z%%M% %I% %E% SMI" #include @@ -247,3 +249,4 @@ rrw_held(rrwlock_t *rrl, krw_t rw) return (held); } +#endif /* HAVE_ZPL */