leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: refactor allocation tree fixup code

Browse Source 
Both algorithms duplicate the same btree allocation code. Eliminate
the duplication and reuse the fallback algorithm codepath.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Brian Foster 2019-10-13 17:10:34 -07:00 committed by Darrick J. Wong
parent fec0afdaf4
commit 4a65b7c2c7
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/xfs/libxfs/xfs_alloc.c
View File

@ -1333,23 +1333,8 @@ restart:
if (acur.len == 0)
break;
/*
* Allocate at the bno/len tracked in the cursor.
*/
args->agbno = acur.bno;
args->len = acur.len;
ASSERT(acur.bno >= acur.rec_bno);
ASSERT(acur.bno + acur.len <= acur.rec_bno + acur.rec_len);
ASSERT(acur.rec_bno + acur.rec_len <=
be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
error = xfs_alloc_fixup_trees(acur.cnt, acur.bnolt,
acur.rec_bno, acur.rec_len, acur.bno, acur.len,
0);
if (error)
goto out;
trace_xfs_alloc_near_first(args);
goto out;
goto alloc;
}
/*
@ -1434,6 +1419,7 @@ restart:
goto out;
}
alloc:
args->agbno = acur.bno;
args->len = acur.len;
ASSERT(acur.bno >= acur.rec_bno);