| Message ID | bf4256a4-a4eb-29e7-b974-0a7c01913d9a@redhat.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | xfs: #ifdef out perag code for userspace | expand |
On Tue, Nov 09, 2021 at 08:02:14PM -0600, Eric Sandeen wrote: > 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> LGTM Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > > diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h > index 15bae1ff..3957a2e0 100644 > --- a/libxfs/libxfs_priv.h > +++ b/libxfs/libxfs_priv.h > @@ -75,6 +75,8 @@ extern kmem_zone_t *xfs_trans_zone; > /* 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 bafee48c..25c4cab5 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__ */ >
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 15bae1ff..3957a2e0 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -75,6 +75,8 @@ extern kmem_zone_t *xfs_trans_zone; /* 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 bafee48c..25c4cab5 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__ */
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> ---