From: Darrick J. Wong Date: Thu, 18 Aug 2016 23:31:29 +0000 (+1000) Subject: libxfs: fix various oddities in the kernel import X-Git-Tag: v4.8.0-rc1~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=794a56048e2493d1750a7fcf7f393bafe03479ac;p=thirdparty%2Fxfsprogs-dev.git libxfs: fix various oddities in the kernel import Fix some minor anomalies in the kernel -> xfsprogs import of the 4.8 libxfs code. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/include/libxfs.h b/include/libxfs.h index 1e6d1d3a7..cf59d6ca3 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -78,6 +78,7 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len); #include "xfs_trace.h" #include "xfs_trans.h" #include "xfs_rmap_btree.h" +#include "xfs_rmap.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) diff --git a/libxfs/init.c b/libxfs/init.c index 71445bb29..842e09055 100644 --- a/libxfs/init.c +++ b/libxfs/init.c @@ -26,6 +26,7 @@ #include "xfs_log_format.h" #include "xfs_trans_resv.h" #include "xfs_mount.h" +#include "xfs_defer.h" #include "xfs_inode_buf.h" #include "xfs_inode_fork.h" #include "xfs_inode.h" diff --git a/libxfs/xfs_rmap_btree.h b/libxfs/xfs_rmap_btree.h index c05155be7..5ff9cfa18 100644 --- a/libxfs/xfs_rmap_btree.h +++ b/libxfs/xfs_rmap_btree.h @@ -58,11 +58,4 @@ struct xfs_btree_cur *xfs_rmapbt_init_cursor(struct xfs_mount *mp, int xfs_rmapbt_maxrecs(struct xfs_mount *mp, int blocklen, int leaf); extern void xfs_rmapbt_compute_maxlevels(struct xfs_mount *mp); -int xfs_rmap_alloc(struct xfs_trans *tp, struct xfs_buf *agbp, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, - struct xfs_owner_info *oinfo); -int xfs_rmap_free(struct xfs_trans *tp, struct xfs_buf *agbp, - xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len, - struct xfs_owner_info *oinfo); - #endif /* __XFS_RMAP_BTREE_H__ */