Commit 68db60bf authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: create a helper to compute leftovers of realtime extents 



Create a helper to compute the misalignment between a file extent
(xfs_extlen_t) and a realtime extent.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent fa5a3872

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -2989,7 +2989,7 @@ xfs_bmap_extsize_align( 
	 * If realtime, and the result isn't a multiple of the realtime

	 * extent size we need to remove blocks until it is.

	 */

	if (rt && (temp = (align_alen % mp->m_sb.sb_rextsize))) {

	if (rt && (temp = xfs_extlen_to_rtxmod(mp, align_alen))) {

		/*

		 * We're not covering the original request, or

		 * we won't be able to once we fix the length.
@@ -3016,7 +3016,7 @@ xfs_bmap_extsize_align( 
		else {

			align_alen -= orig_off - align_off;

			align_off = orig_off;

			align_alen -= align_alen % mp->m_sb.sb_rextsize;

			align_alen -= xfs_extlen_to_rtxmod(mp, align_alen);

		}

		/*

		 * Result doesn't cover the request, fail it.

fs/xfs/libxfs/xfs_rtbitmap.h

+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,15 @@ xfs_rtxlen_to_extlen( 
	return rtxlen * mp->m_sb.sb_rextsize;

}



/* Compute the misalignment between an extent length and a realtime extent .*/

static inline unsigned int

xfs_extlen_to_rtxmod(

	struct xfs_mount	*mp,

	xfs_extlen_t		len)

{

	return len % mp->m_sb.sb_rextsize;

}



/*

 * Functions for walking free space rtextents in the realtime bitmap.

 */

fs/xfs/scrub/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "xfs_reflink.h"

#include "xfs_rmap.h"

#include "xfs_bmap_util.h"

#include "xfs_rtbitmap.h"

#include "scrub/scrub.h"

#include "scrub/common.h"

#include "scrub/btree.h"
@@ -225,7 +226,7 @@ xchk_inode_extsize( 
	 */

	if ((flags & XFS_DIFLAG_RTINHERIT) &&

	    (flags & XFS_DIFLAG_EXTSZINHERIT) &&

	    value % sc->mp->m_sb.sb_rextsize > 0)

	    xfs_extlen_to_rtxmod(sc->mp, value) > 0)

		xchk_ino_set_warning(sc, ino);

}

fs/xfs/xfs_bmap_util.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ xfs_bmap_rtalloc( 
	if (error)

		return error;

	ASSERT(ap->length);

	ASSERT(ap->length % mp->m_sb.sb_rextsize == 0);

	ASSERT(xfs_extlen_to_rtxmod(mp, ap->length) == 0);



	/*

	 * If we shifted the file offset downward to satisfy an extent size

fs/xfs/xfs_inode_item.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "xfs_log.h"

#include "xfs_log_priv.h"

#include "xfs_error.h"

#include "xfs_rtbitmap.h"



#include <linux/iversion.h>
@@ -107,7 +108,7 @@ xfs_inode_item_precommit( 
	 */

	if ((ip->i_diflags & XFS_DIFLAG_RTINHERIT) &&

	    (ip->i_diflags & XFS_DIFLAG_EXTSZINHERIT) &&

	    (ip->i_extsize % ip->i_mount->m_sb.sb_rextsize) > 0) {

	    xfs_extlen_to_rtxmod(ip->i_mount, ip->i_extsize) > 0) {

		ip->i_diflags &= ~(XFS_DIFLAG_EXTSIZE |

				   XFS_DIFLAG_EXTSZINHERIT);

		ip->i_extsize = 0;