xfs
[Top] [All Lists]

[PATCH 1/4] xfs: reorganize xfs_iomap_prealloc_size to remove indentatio

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/4] xfs: reorganize xfs_iomap_prealloc_size to remove indentation
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Wed, 5 Dec 2012 11:47:55 -0500
In-reply-to: <1354726078-31793-1-git-send-email-bfoster@xxxxxxxxxx>
References: <1354726078-31793-1-git-send-email-bfoster@xxxxxxxxxx>
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: Brian Foster <bfoster@xxxxxxxxxx>
---
 fs/xfs/xfs_iomap.c |   55 ++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index add06b4..bd7c060 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -322,37 +322,38 @@ xfs_iomap_prealloc_size(
        struct xfs_inode        *ip)
 {
        xfs_fsblock_t           alloc_blocks = 0;
+       int                     shift = 0;
+       int64_t                 freesp;
 
-       if (!(mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)) {
-               int shift = 0;
-               int64_t freesp;
+       if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)
+               goto check_writeio;
 
-               /*
-                * rounddown_pow_of_two() returns an undefined result
-                * if we pass in alloc_blocks = 0. Hence the "+ 1" to
-                * ensure we always pass in a non-zero value.
-                */
-               alloc_blocks = XFS_B_TO_FSB(mp, XFS_ISIZE(ip)) + 1;
-               alloc_blocks = XFS_FILEOFF_MIN(MAXEXTLEN,
-                                       rounddown_pow_of_two(alloc_blocks));
-
-               xfs_icsb_sync_counters(mp, XFS_ICSB_LAZY_COUNT);
-               freesp = mp->m_sb.sb_fdblocks;
-               if (freesp < mp->m_low_space[XFS_LOWSP_5_PCNT]) {
-                       shift = 2;
-                       if (freesp < mp->m_low_space[XFS_LOWSP_4_PCNT])
-                               shift++;
-                       if (freesp < mp->m_low_space[XFS_LOWSP_3_PCNT])
-                               shift++;
-                       if (freesp < mp->m_low_space[XFS_LOWSP_2_PCNT])
-                               shift++;
-                       if (freesp < mp->m_low_space[XFS_LOWSP_1_PCNT])
-                               shift++;
-               }
-               if (shift)
-                       alloc_blocks >>= shift;
+       /*
+        * rounddown_pow_of_two() returns an undefined result
+        * if we pass in alloc_blocks = 0. Hence the "+ 1" to
+        * ensure we always pass in a non-zero value.
+        */
+       alloc_blocks = XFS_B_TO_FSB(mp, XFS_ISIZE(ip)) + 1;
+       alloc_blocks = XFS_FILEOFF_MIN(MAXEXTLEN,
+                               rounddown_pow_of_two(alloc_blocks));
+
+       xfs_icsb_sync_counters(mp, XFS_ICSB_LAZY_COUNT);
+       freesp = mp->m_sb.sb_fdblocks;
+       if (freesp < mp->m_low_space[XFS_LOWSP_5_PCNT]) {
+               shift = 2;
+               if (freesp < mp->m_low_space[XFS_LOWSP_4_PCNT])
+                       shift++;
+               if (freesp < mp->m_low_space[XFS_LOWSP_3_PCNT])
+                       shift++;
+               if (freesp < mp->m_low_space[XFS_LOWSP_2_PCNT])
+                       shift++;
+               if (freesp < mp->m_low_space[XFS_LOWSP_1_PCNT])
+                       shift++;
        }
+       if (shift)
+               alloc_blocks >>= shift;
 
+check_writeio:
        if (alloc_blocks < mp->m_writeio_blocks)
                alloc_blocks = mp->m_writeio_blocks;
 
-- 
1.7.7.6

<Prev in Thread] Current Thread [Next in Thread>