From d9498fa8c8580b9cedb764e475503706ba7a0fbf Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 18 Dec 2023 05:57:30 +0100 Subject: xfs: merge the calls to xfs_rtallocate_range in xfs_rtallocate_block Use a goto to use a common tail for the case of being able to allocate an extent. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" Signed-off-by: Chandan Babu R --- fs/xfs/xfs_rtalloc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'fs/xfs') diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index c52f479e3abd..774e55cd602f 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -252,19 +252,15 @@ xfs_rtallocate_extent_block( error = xfs_rtcheck_range(args, i, maxlen, 1, &next, &stat); if (error) return error; - if (stat) { /* * i for maxlen is all free, allocate and return that. */ - error = xfs_rtallocate_range(args, i, maxlen); - if (error) - return error; - - *len = maxlen; - *rtx = i; - return 0; + bestlen = maxlen; + besti = i; + goto allocate; } + /* * In the case where we have a variable-sized allocation * request, figure out how big this free piece is, @@ -315,6 +311,7 @@ xfs_rtallocate_extent_block( /* * Allocate besti for bestlen & return that. */ +allocate: error = xfs_rtallocate_range(args, besti, bestlen); if (error) return error; -- cgit v1.2.3