libxfs: remove kernel stubs from xfs_shared.h

The kernel stubs added to xfs_shared.h don't belong there, and are
mostly unnecessary with the #ifdef __KERNEL__ bits added to the
xfs_ag.[ch] files. Move the one remaining needed stub in libxfs_priv.h.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 53f45d5a5340d35e66a5d1be12f6d5666d1fa644..d4fec7355768190a27014b55741aabafe2152d50 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -75,6 +75,8 @@ extern struct kmem_cache *xfs_trans_cache;
 /* fake up kernel's iomap, (not) used in xfs_bmap.[ch] */
 struct iomap;
 
+#define cancel_delayed_work_sync(work) do { } while(0)
+
 #include "xfs_cksum.h"
 
 /*

diff --git a/libxfs/xfs_shared.h b/libxfs/xfs_shared.h
index bafee48cddb10f995118801d768c4250f385aafc..25c4cab58851c18bb9fa7d71bbed63434b7ac091 100644 (file)
--- a/libxfs/xfs_shared.h
+++ b/libxfs/xfs_shared.h
@@ -180,24 +180,4 @@ struct xfs_ino_geometry {
 
 };
 
-/* Faked up kernel bits */
-struct rb_root {
-};
-
-#define RB_ROOT                (struct rb_root) { }
-
-typedef struct wait_queue_head {
-} wait_queue_head_t;
-
-#define init_waitqueue_head(wqh)       do { } while(0)
-
-struct rhashtable {
-};
-
-struct delayed_work {
-};
-
-#define INIT_DELAYED_WORK(work, func)  do { } while(0)
-#define cancel_delayed_work_sync(work) do { } while(0)
-
 #endif /* __XFS_SHARED_H__ */