| Message ID | 147830456618.26713.15449667779126141448.stgit@birch.djwong.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Nov 04, 2016 at 05:09:26PM -0700, Darrick J. Wong wrote: > Evidently the libxfs-apply script sucked in some fs/xfs/ content from > the kernel patches and an extra redefinition of _bmap_search_extents. > We don't need this, so get rid of it. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Looks fine, Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c deleted file mode 100644 index e69de29..0000000 diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/xfs_rmap_item.h deleted file mode 100644 index e69de29..0000000 diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h index 482e151..7cae6ec 100644 --- a/libxfs/xfs_bmap.h +++ b/libxfs/xfs_bmap.h @@ -246,13 +246,6 @@ int xfs_bmapi_reserve_delalloc(struct xfs_inode *ip, int whichfork, struct xfs_bmbt_irec *got, struct xfs_bmbt_irec *prev, xfs_extnum_t *lastx, int eof); -struct xfs_bmbt_rec_host * - xfs_bmap_search_extents(struct xfs_inode *ip, xfs_fileoff_t bno, - int fork, int *eofp, xfs_extnum_t *lastxp, - struct xfs_bmbt_irec *gotp, - struct xfs_bmbt_irec *prevp); - - enum xfs_bmap_intent_type { XFS_BMAP_MAP = 1, XFS_BMAP_UNMAP,
Evidently the libxfs-apply script sucked in some fs/xfs/ content from the kernel patches and an extra redefinition of _bmap_search_extents. We don't need this, so get rid of it. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- fs/xfs/xfs_rmap_item.c | 0 fs/xfs/xfs_rmap_item.h | 0 libxfs/xfs_bmap.h | 7 ------- 3 files changed, 7 deletions(-) delete mode 100644 fs/xfs/xfs_rmap_item.c delete mode 100644 fs/xfs/xfs_rmap_item.h -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html