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 <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/include/libxfs.h b/include/libxfs.h
index 1e6d1d3a77bbc284974d87df242aa1f4827c2764..cf59d6ca3d7eaf61e4fc29db67b8514e3d00ab24 100644 (file)
--- 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 71445bb29f92853b3d7b766dda64c4920fd32521..842e090554ac931205d79f7f8937155f7e952f5d 100644 (file)
--- 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 c05155be7f72cb2a782f9a3f7bfdeb052ac46da6..5ff9cfa18cfd3e5918d97d8c77ae9dff24c58ad1 100644 (file)
--- 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__ */