diff options
| -rw-r--r-- | fs/xfs/xfs_alloc.c | 12 | 
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index 3ad3ab9f56c..1e00b3ef627 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c @@ -570,9 +570,7 @@ xfs_alloc_ag_vextent_exact(  	xfs_agblock_t	tbno;	/* start block of trimmed extent */  	xfs_extlen_t	tlen;	/* length of trimmed extent */  	xfs_agblock_t	tend;	/* end block of trimmed extent */ -	xfs_agblock_t	end;	/* end of allocated extent */  	int		i;	/* success/failure of operation */ -	xfs_extlen_t	rlen;	/* length of returned extent */  	ASSERT(args->alignment == 1); @@ -625,18 +623,16 @@ xfs_alloc_ag_vextent_exact(  	 *  	 * Fix the length according to mod and prod if given.  	 */ -	end = XFS_AGBLOCK_MIN(tend, args->agbno + args->maxlen); -	args->len = end - args->agbno; +	args->len = XFS_AGBLOCK_MIN(tend, args->agbno + args->maxlen) +						- args->agbno;  	xfs_alloc_fix_len(args);  	if (!xfs_alloc_fix_minleft(args))  		goto not_found; -	rlen = args->len; -	ASSERT(args->agbno + rlen <= tend); -	end = args->agbno + rlen; +	ASSERT(args->agbno + args->len <= tend);  	/* -	 * We are allocating agbno for rlen [agbno .. end] +	 * We are allocating agbno for args->len  	 * Allocate/initialize a cursor for the by-size btree.  	 */  	cnt_cur = xfs_allocbt_init_cursor(args->mp, args->tp, args->agbp,  |