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

Commit 71ddabb9 authored by Eric Sandeen's avatar Eric Sandeen Committed by Lachlan McIlroy
Browse files

[XFS] optimize XFS_IS_REALTIME_INODE w/o realtime config 



Use XFS_IS_REALTIME_INODE in more places, and #define it to 0 if
CONFIG_XFS_RT is off. This should be safe because mount checks in
xfs_rtmount_init:

so if we get mounted w/o CONFIG_XFS_RT, no realtime inodes should be
encountered after that.

Defining XFS_IS_REALTIME_INODE to 0 saves a bit of stack space,
presumeably gcc can optimize around the various "if (0)" type checks:

xfs_alloc_file_space -8 xfs_bmap_adjacent -16 xfs_bmapi -8
xfs_bmap_rtalloc -16 xfs_bunmapi -28 xfs_free_file_space -64 xfs_imap +8
<-- ? hmm. xfs_iomap_write_direct -12 xfs_qm_dqusage_adjust -4
xfs_qm_vop_chown_reserve -4

SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30014a

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent a67d7c5f

fs/xfs/linux-2.6/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ xfs_find_bdev_for_inode( 
{

	struct xfs_mount	*mp = ip->i_mount;



	if (ip->i_d.di_flags & XFS_DIFLAG_REALTIME)

	if (XFS_IS_REALTIME_INODE(ip))

		return mp->m_rtdev_targp->bt_bdev;

	else

		return mp->m_ddev_targp->bt_bdev;

fs/xfs/linux-2.6/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ xfs_ioctl( 
	case XFS_IOC_DIOINFO: {

		struct dioattr	da;

		xfs_buftarg_t	*target =

			(ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ?

			XFS_IS_REALTIME_INODE(ip) ?

			mp->m_rtdev_targp : mp->m_ddev_targp;



		da.d_mem = da.d_miniosz = 1 << target->bt_sshift;

fs/xfs/linux-2.6/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ xfs_vn_getattr( 
				   sysv_minor(ip->i_df.if_u2.if_rdev));

		break;

	default:

		if (ip->i_d.di_flags & XFS_DIFLAG_REALTIME) {

		if (XFS_IS_REALTIME_INODE(ip)) {

			/*

			 * If the file blocks are being allocated from a

			 * realtime volume, then return the inode's realtime

fs/xfs/linux-2.6/xfs_lrw.c

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ xfs_read( 


	if (unlikely(ioflags & IO_ISDIRECT)) {

		xfs_buftarg_t	*target =

			(ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ?

			XFS_IS_REALTIME_INODE(ip) ?

				mp->m_rtdev_targp : mp->m_ddev_targp;

		if ((*offset & target->bt_smask) ||

		    (size & target->bt_smask)) {
@@ -657,7 +657,7 @@ xfs_write( 


	if (ioflags & IO_ISDIRECT) {

		xfs_buftarg_t	*target =

			(xip->i_d.di_flags & XFS_DIFLAG_REALTIME) ?

			XFS_IS_REALTIME_INODE(xip) ?

				mp->m_rtdev_targp : mp->m_ddev_targp;



		if ((pos & target->bt_smask) || (count & target->bt_smask)) {

fs/xfs/xfs_bmap.c

+2 −3
Original line number Diff line number Diff line
@@ -2969,7 +2969,7 @@ STATIC int 
xfs_bmap_alloc(

	xfs_bmalloca_t	*ap)		/* bmap alloc argument struct */

{

	if ((ap->ip->i_d.di_flags & XFS_DIFLAG_REALTIME) && ap->userdata)

	if (XFS_IS_REALTIME_INODE(ap->ip) && ap->userdata)

		return xfs_bmap_rtalloc(ap);

	return xfs_bmap_btalloc(ap);

}
@@ -3096,8 +3096,7 @@ xfs_bmap_del_extent( 
		/*

		 * Realtime allocation.  Free it and record di_nblocks update.

		 */

		if (whichfork == XFS_DATA_FORK &&

		    (ip->i_d.di_flags & XFS_DIFLAG_REALTIME)) {

		if (whichfork == XFS_DATA_FORK && XFS_IS_REALTIME_INODE(ip)) {

			xfs_fsblock_t	bno;

			xfs_filblks_t	len;