Commit 957d0ebe authored by David Chinner's avatar David Chinner Committed by Tim Shimmin
Browse files

[XFS] Cleanup inode extent size hint extraction 



SGI-PV: 966004
SGI-Modid: xfs-linux-melb:xfs-kern:28866a

Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 84e1e99f

fs/xfs/xfs_bmap.c

+7 −16
Original line number Diff line number Diff line
@@ -2609,8 +2609,7 @@ xfs_bmap_rtalloc( 
	xfs_rtblock_t	rtb;



	mp = ap->ip->i_mount;

	align = ap->ip->i_d.di_extsize ?

		ap->ip->i_d.di_extsize : mp->m_sb.sb_rextsize;

	align = xfs_get_extsz_hint(ap->ip);

	prod = align / mp->m_sb.sb_rextsize;

	error = xfs_bmap_extsize_align(mp, ap->gotp, ap->prevp,

					align, 1, ap->eof, 0,
@@ -2715,9 +2714,7 @@ xfs_bmap_btalloc( 
	int		error;



	mp = ap->ip->i_mount;

	align = (ap->userdata && ap->ip->i_d.di_extsize &&

		(ap->ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE)) ?

		ap->ip->i_d.di_extsize : 0;

	align = ap->userdata ? xfs_get_extsz_hint(ap->ip) : 0;

	if (unlikely(align)) {

		error = xfs_bmap_extsize_align(mp, ap->gotp, ap->prevp,

						align, 0, ap->eof, 0, ap->conv,
@@ -2817,9 +2814,9 @@ xfs_bmap_btalloc( 
		args.total = ap->total;

		args.minlen = ap->minlen;

	}

	if (unlikely(ap->userdata && ap->ip->i_d.di_extsize &&

		    (ap->ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE))) {

		args.prod = ap->ip->i_d.di_extsize;

	/* apply extent size hints if obtained earlier */

	if (unlikely(align)) {

		args.prod = align;

		if ((args.mod = (xfs_extlen_t)do_mod(ap->off, args.prod)))

			args.mod = (xfs_extlen_t)(args.prod - args.mod);

	} else if (mp->m_sb.sb_blocksize >= NBPP) {
@@ -4868,12 +4865,7 @@ xfs_bmapi( 
				xfs_extlen_t	extsz;



				/* Figure out the extent size, adjust alen */

				if (rt) {

					if (!(extsz = ip->i_d.di_extsize))

						extsz = mp->m_sb.sb_rextsize;

				} else {

					extsz = ip->i_d.di_extsize;

				}

				extsz = xfs_get_extsz_hint(ip);

				if (extsz) {

					error = xfs_bmap_extsize_align(mp,

							&got, &prev, extsz,
@@ -5813,8 +5805,7 @@ xfs_getbmap( 
		   ip->i_d.di_format != XFS_DINODE_FMT_LOCAL)

		return XFS_ERROR(EINVAL);

	if (whichfork == XFS_DATA_FORK) {

		if ((ip->i_d.di_extsize && (ip->i_d.di_flags &

				(XFS_DIFLAG_REALTIME|XFS_DIFLAG_EXTSIZE))) ||

		if (xfs_get_extsz_hint(ip) ||

		    ip->i_d.di_flags & (XFS_DIFLAG_PREALLOC|XFS_DIFLAG_APPEND)){

			prealloced = 1;

			fixlen = XFS_MAXIOFFSET(mp);

fs/xfs/xfs_iomap.c

+4 −15
Original line number Diff line number Diff line
@@ -451,12 +451,7 @@ xfs_iomap_write_direct( 
		return XFS_ERROR(error);



	rt = XFS_IS_REALTIME_INODE(ip);

	if (unlikely(rt)) {

		if (!(extsz = ip->i_d.di_extsize))

			extsz = mp->m_sb.sb_rextsize;

	} else {

		extsz = ip->i_d.di_extsize;

	}

	extsz = xfs_get_extsz_hint(ip);



	isize = ip->i_size;

	if (io->io_new_size > isize)
@@ -666,13 +661,7 @@ xfs_iomap_write_delay( 
	if (error)

		return XFS_ERROR(error);



	if (XFS_IS_REALTIME_INODE(ip)) {

		if (!(extsz = ip->i_d.di_extsize))

			extsz = mp->m_sb.sb_rextsize;

	} else {

		extsz = ip->i_d.di_extsize;

	}



	extsz = xfs_get_extsz_hint(ip);

	offset_fsb = XFS_B_TO_FSBT(mp, offset);



retry:

fs/xfs/xfs_rw.h

+22 −0
Original line number Diff line number Diff line
@@ -77,6 +77,28 @@ xfs_fsb_to_db_io(struct xfs_iocore *io, xfs_fsblock_t fsb) 
#define XFS_FREE_EOF_LOCK	(1<<0)

#define XFS_FREE_EOF_NOLOCK	(1<<1)





/*

 * helper function to extract extent size hint from inode

 */

STATIC_INLINE xfs_extlen_t

xfs_get_extsz_hint(

	xfs_inode_t	*ip)

{

	xfs_extlen_t	extsz;



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

		extsz = (ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE)

				? ip->i_d.di_extsize

				: ip->i_mount->m_sb.sb_rextsize;

		ASSERT(extsz);

	} else {

		extsz = (ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE)

				? ip->i_d.di_extsize : 0;

	}

	return extsz;

}



/*

 * Prototypes for functions in xfs_rw.c.

 */

fs/xfs/xfs_vnodeops.c

+5 −12
Original line number Diff line number Diff line
@@ -183,9 +183,8 @@ xfs_getattr( 
			 * realtime extent size or the realtime volume's

			 * extent size.

			 */

			vap->va_blocksize = ip->i_d.di_extsize ?

				(ip->i_d.di_extsize << mp->m_sb.sb_blocklog) :

				(mp->m_sb.sb_rextsize << mp->m_sb.sb_blocklog);

			vap->va_blocksize =

				xfs_get_extsz_hint(ip) << mp->m_sb.sb_blocklog;

		}

		break;

	}
@@ -4055,22 +4054,16 @@ xfs_alloc_file_space( 
	if (XFS_FORCED_SHUTDOWN(mp))

		return XFS_ERROR(EIO);



	rt = XFS_IS_REALTIME_INODE(ip);

	if (unlikely(rt)) {

		if (!(extsz = ip->i_d.di_extsize))

			extsz = mp->m_sb.sb_rextsize;

	} else {

		extsz = ip->i_d.di_extsize;

	}



	if ((error = XFS_QM_DQATTACH(mp, ip, 0)))

		return error;



	if (len <= 0)

		return XFS_ERROR(EINVAL);



	rt = XFS_IS_REALTIME_INODE(ip);

	extsz = xfs_get_extsz_hint(ip);



	count = len;

	error = 0;

	imapp = &imaps[0];

	nimaps = 1;

	bmapi_flag = XFS_BMAPI_WRITE | (alloc_type ? XFS_BMAPI_PREALLOC : 0);