From f41626ced690778df009c50d2da5e3456a479f1c Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 22 Dec 2008 13:46:30 -0800
Subject: [PATCH] Make ZPL conditional

---
 module/zfs/rrwlock.c | 4 ----
 module/zfs/zfs_acl.c | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/zfs/rrwlock.c b/module/zfs/rrwlock.c
index 7bce5dd8d7..710685dbc7 100644
--- a/module/zfs/rrwlock.c
+++ b/module/zfs/rrwlock.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#ifdef HAVE_ZPL
-
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/refcount.h>
@@ -249,5 +247,3 @@ rrw_held(rrwlock_t *rrl, krw_t rw)
 
 	return (held);
 }
-
-#endif /* HAVE_ZPL */
diff --git a/module/zfs/zfs_acl.c b/module/zfs/zfs_acl.c
index 341dc4dfe7..1299e73793 100644
--- a/module/zfs/zfs_acl.c
+++ b/module/zfs/zfs_acl.c
@@ -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 */