aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2022-05-04 14:49:14 -0400
committerEric Sandeen <sandeen@sandeen.net>2022-05-04 14:49:14 -0400
commit8804eaced35c075fe9c25ca5a5ffe9289502feb3 (patch)
tree099f4f1ddd5dd425ff68989781cbbbad4b06a3ab
parentb5d61e9002218e21d709f66be535b7954d4d9bb9 (diff)
downloadxfsprogs-dev-8804eaced35c075fe9c25ca5a5ffe9289502feb3.tar.gz
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>
-rw-r--r--libxfs/libxfs_priv.h2
-rw-r--r--libxfs/xfs_shared.h20
2 files changed, 2 insertions, 20 deletions
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 53f45d5a53..d4fec73557 100644
--- 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 bafee48cdd..25c4cab588 100644
--- 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__ */