Now that the xfs_rtallocate_extent name has been freed, use it for what
so far is xfs_bmap_rtalloc as the name is a lot better fitting.
Also drop the !CONFIG_XFS_RT stub as the compiler will eliminate the
call for that case given that XFS_IS_REALTIME_INODE is hard wire to
return 0 in the !CONFIG_XFS_RT case.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
fs/xfs/libxfs/xfs_bmap.c | 2 +-
fs/xfs/xfs_bmap_util.h | 15 +--------------
fs/xfs/xfs_rtalloc.c | 2 +-
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 46a9b22a3733e3..245f7045da15c4 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4091,7 +4091,7 @@ xfs_bmap_alloc_userdata(
}
if (XFS_IS_REALTIME_INODE(bma->ip))
- return xfs_bmap_rtalloc(bma);
+ return xfs_rtallocate_extent(bma);
}
if (unlikely(XFS_TEST_ERROR(false, mp,
diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h
index 77ecbb753ef207..233bbbd2a4676d 100644
--- a/fs/xfs/xfs_bmap_util.h
+++ b/fs/xfs/xfs_bmap_util.h
@@ -16,20 +16,7 @@ struct xfs_mount;
struct xfs_trans;
struct xfs_bmalloca;
-#ifdef CONFIG_XFS_RT
-int xfs_bmap_rtalloc(struct xfs_bmalloca *ap);
-#else /* !CONFIG_XFS_RT */
-/*
- * Attempts to allocate RT extents when RT is disable indicates corruption and
- * should trigger a shutdown.
- */
-static inline int
-xfs_bmap_rtalloc(struct xfs_bmalloca *ap)
-{
- return -EFSCORRUPTED;
-}
-#endif /* CONFIG_XFS_RT */
-
+int xfs_rtallocate_extent(struct xfs_bmalloca *ap);
int xfs_bmap_punch_delalloc_range(struct xfs_inode *ip,
xfs_off_t start_byte, xfs_off_t end_byte);
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 4b2de22bdd70cc..6344e499af8e27 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -1312,7 +1312,7 @@ xfs_rtalloc_align_minmax(
}
int
-xfs_bmap_rtalloc(
+xfs_rtallocate_extent(
struct xfs_bmalloca *ap)
{
struct xfs_mount *mp = ap->ip->i_mount;
--
2.39.2
