Commit 2bf6e353 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R
Browse files

xfs: fix rtalloc rotoring when delalloc is in use 



If we're trying to allocate real space for a delalloc reservation at
offset 0, we should use the rotor to spread files across the rt volume.

Switch the rtalloc to use the XFS_ALLOC_INITIAL_USER_DATA flag that
is set for any write at startoff to make it match the behavior for
the main data device.

Based on a patch from Darrick J. Wong.

Fixes: 6a94b1ac ("xfs: reinstate delalloc for RT inodes (if sb_rextsize == 1)")
Reported-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 49cdc4e8

fs/xfs/xfs_rtalloc.c

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

#include "xfs_mount.h"

#include "xfs_inode.h"

#include "xfs_alloc.h"

#include "xfs_bmap.h"

#include "xfs_bmap_btree.h"

#include "xfs_bmap_util.h"
@@ -1382,7 +1383,7 @@ xfs_bmap_rtalloc( 
		start = 0;

	} else if (xfs_bmap_adjacent(ap)) {

		start = xfs_rtb_to_rtx(mp, ap->blkno);

	} else if (ap->eof && ap->offset == 0) {

	} else if (ap->datatype & XFS_ALLOC_INITIAL_USER_DATA) {

		/*

		 * If it's an allocation to an empty file at offset 0, pick an

		 * extent that will space things out in the rt area.