Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9c2e54 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: move more RT specific code under CONFIG_XFS_RT 



Various utility functions and interfaces that iterate internal
devices try to reference the realtime device even when RT support is
not compiled into the kernel.

Make sure this code is excluded from the CONFIG_XFS_RT=n build,
and where appropriate stub functions to return fatal errors if
they ever get called when RT support is not present.

Signed-Off-By: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 20413e37

fs/xfs/xfs_bmap_util.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ xfs_zero_extent( 
		GFP_NOFS, 0);

}



#ifdef CONFIG_XFS_RT

int

xfs_bmap_rtalloc(

	struct xfs_bmalloca	*ap)	/* bmap alloc argument struct */
@@ -190,6 +191,7 @@ xfs_bmap_rtalloc( 
	}

	return 0;

}

#endif /* CONFIG_XFS_RT */



/*

 * Check if the endoff is outside the last extent. If so the caller will grow

fs/xfs/xfs_bmap_util.h

+13 −0
Original line number Diff line number Diff line
@@ -28,7 +28,20 @@ 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_bmap_eof(struct xfs_inode *ip, xfs_fileoff_t endoff,

		     int whichfork, int *eof);

int	xfs_bmap_punch_delalloc_range(struct xfs_inode *ip,

fs/xfs/xfs_fsmap.c

+12 −0
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ __xfs_getfsmap_rtdev( 
	return query_fn(tp, info);

}



#ifdef CONFIG_XFS_RT

/* Actually query the realtime bitmap. */

STATIC int

xfs_getfsmap_rtdev_rtbitmap_query(
@@ -561,6 +562,7 @@ xfs_getfsmap_rtdev_rtbitmap( 
	return __xfs_getfsmap_rtdev(tp, keys, xfs_getfsmap_rtdev_rtbitmap_query,

			info);

}

#endif /* CONFIG_XFS_RT */



/* Execute a getfsmap query against the regular data device. */

STATIC int
@@ -795,7 +797,15 @@ xfs_getfsmap_check_keys( 
	return false;

}



/*

 * There are only two devices if we didn't configure RT devices at build time.

 */

#ifdef CONFIG_XFS_RT

#define XFS_GETFSMAP_DEVS	3

#else

#define XFS_GETFSMAP_DEVS	2

#endif /* CONFIG_XFS_RT */



/*

 * Get filesystem's extents as described in head, and format for

 * output.  Calls formatter to fill the user's buffer until all
@@ -853,10 +863,12 @@ xfs_getfsmap( 
		handlers[1].dev = new_encode_dev(mp->m_logdev_targp->bt_dev);

		handlers[1].fn = xfs_getfsmap_logdev;

	}

#ifdef CONFIG_XFS_RT

	if (mp->m_rtdev_targp) {

		handlers[2].dev = new_encode_dev(mp->m_rtdev_targp->bt_dev);

		handlers[2].fn = xfs_getfsmap_rtdev_rtbitmap;

	}

#endif /* CONFIG_XFS_RT */



	xfs_sort(handlers, XFS_GETFSMAP_DEVS, sizeof(struct xfs_getfsmap_dev),

			xfs_getfsmap_dev_compare);