Commit 3c58b5f8 authored by Brian Foster's avatar Brian Foster Committed by Ben Myers

xfs: reorganize xfs_iomap_prealloc_size to remove indentation

The majority of xfs_iomap_prealloc_size() executes within the
check for lack of default I/O size. Reverse the logic to remove the
extra indentation.
Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 56cea2d0
...@@ -381,42 +381,43 @@ xfs_iomap_prealloc_size( ...@@ -381,42 +381,43 @@ xfs_iomap_prealloc_size(
int nimaps) int nimaps)
{ {
xfs_fsblock_t alloc_blocks = 0; xfs_fsblock_t alloc_blocks = 0;
int shift = 0;
int64_t freesp;
alloc_blocks = xfs_iomap_eof_prealloc_initial_size(mp, ip, offset, alloc_blocks = xfs_iomap_eof_prealloc_initial_size(mp, ip, offset,
imap, nimaps); imap, nimaps);
if (alloc_blocks > 0) { if (!alloc_blocks)
int shift = 0; goto check_writeio;
int64_t freesp;
alloc_blocks = XFS_FILEOFF_MIN(MAXEXTLEN,
alloc_blocks = XFS_FILEOFF_MIN(MAXEXTLEN, rounddown_pow_of_two(alloc_blocks));
rounddown_pow_of_two(alloc_blocks));
xfs_icsb_sync_counters(mp, XFS_ICSB_LAZY_COUNT);
xfs_icsb_sync_counters(mp, XFS_ICSB_LAZY_COUNT); freesp = mp->m_sb.sb_fdblocks;
freesp = mp->m_sb.sb_fdblocks; if (freesp < mp->m_low_space[XFS_LOWSP_5_PCNT]) {
if (freesp < mp->m_low_space[XFS_LOWSP_5_PCNT]) { shift = 2;
shift = 2; if (freesp < mp->m_low_space[XFS_LOWSP_4_PCNT])
if (freesp < mp->m_low_space[XFS_LOWSP_4_PCNT]) shift++;
shift++; if (freesp < mp->m_low_space[XFS_LOWSP_3_PCNT])
if (freesp < mp->m_low_space[XFS_LOWSP_3_PCNT]) shift++;
shift++; if (freesp < mp->m_low_space[XFS_LOWSP_2_PCNT])
if (freesp < mp->m_low_space[XFS_LOWSP_2_PCNT]) shift++;
shift++; if (freesp < mp->m_low_space[XFS_LOWSP_1_PCNT])
if (freesp < mp->m_low_space[XFS_LOWSP_1_PCNT]) shift++;
shift++;
}
if (shift)
alloc_blocks >>= shift;
/*
* If we are still trying to allocate more space than is
* available, squash the prealloc hard. This can happen if we
* have a large file on a small filesystem and the above
* lowspace thresholds are smaller than MAXEXTLEN.
*/
while (alloc_blocks && alloc_blocks >= freesp)
alloc_blocks >>= 4;
} }
if (shift)
alloc_blocks >>= shift;
/*
* If we are still trying to allocate more space than is
* available, squash the prealloc hard. This can happen if we
* have a large file on a small filesystem and the above
* lowspace thresholds are smaller than MAXEXTLEN.
*/
while (alloc_blocks && alloc_blocks >= freesp)
alloc_blocks >>= 4;
check_writeio:
if (alloc_blocks < mp->m_writeio_blocks) if (alloc_blocks < mp->m_writeio_blocks)
alloc_blocks = mp->m_writeio_blocks; alloc_blocks = mp->m_writeio_blocks;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment