* [PATCH] xfs: use swap macro in xfs_dir2_leafn_rebalance
@ 2018-07-17 16:11 Gustavo A. R. Silva
2018-07-17 17:14 ` Darrick J. Wong
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-17 16:11 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: linux-xfs, linux-kernel, Gustavo A. R. Silva
Make use of the swap macro and remove unnecessary variable *tmp*. This
makes the code easier to read and maintain. Also, slightly refactor some
code.
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
fs/xfs/libxfs/xfs_dir2_node.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 2daf874..f1bb343 100644
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -1012,7 +1012,7 @@ xfs_dir2_leafn_rebalance(
int oldstale; /* old count of stale leaves */
#endif
int oldsum; /* old total leaf count */
- int swap; /* swapped leaf blocks */
+ int swap_blocks; /* swapped leaf blocks */
struct xfs_dir2_leaf_entry *ents1;
struct xfs_dir2_leaf_entry *ents2;
struct xfs_dir3_icleaf_hdr hdr1;
@@ -1023,13 +1023,10 @@ xfs_dir2_leafn_rebalance(
/*
* If the block order is wrong, swap the arguments.
*/
- if ((swap = xfs_dir2_leafn_order(dp, blk1->bp, blk2->bp))) {
- xfs_da_state_blk_t *tmp; /* temp for block swap */
+ swap_blocks = xfs_dir2_leafn_order(dp, blk1->bp, blk2->bp);
+ if (swap_blocks)
+ swap(blk1, blk2);
- tmp = blk1;
- blk1 = blk2;
- blk2 = tmp;
- }
leaf1 = blk1->bp->b_addr;
leaf2 = blk2->bp->b_addr;
dp->d_ops->leaf_hdr_from_disk(&hdr1, leaf1);
@@ -1093,11 +1090,11 @@ xfs_dir2_leafn_rebalance(
* Mark whether we're inserting into the old or new leaf.
*/
if (hdr1.count < hdr2.count)
- state->inleaf = swap;
+ state->inleaf = swap_blocks;
else if (hdr1.count > hdr2.count)
- state->inleaf = !swap;
+ state->inleaf = !swap_blocks;
else
- state->inleaf = swap ^ (blk1->index <= hdr1.count);
+ state->inleaf = swap_blocks ^ (blk1->index <= hdr1.count);
/*
* Adjust the expected index for insertion.
*/
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] xfs: use swap macro in xfs_dir2_leafn_rebalance
2018-07-17 16:11 [PATCH] xfs: use swap macro in xfs_dir2_leafn_rebalance Gustavo A. R. Silva
@ 2018-07-17 17:14 ` Darrick J. Wong
0 siblings, 0 replies; 2+ messages in thread
From: Darrick J. Wong @ 2018-07-17 17:14 UTC (permalink / raw)
To: Gustavo A. R. Silva; +Cc: linux-xfs, linux-kernel
On Tue, Jul 17, 2018 at 11:11:27AM -0500, Gustavo A. R. Silva wrote:
> Make use of the swap macro and remove unnecessary variable *tmp*. This
> makes the code easier to read and maintain. Also, slightly refactor some
> code.
>
> This code was detected with the help of Coccinelle.
>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Looks ok, will test...
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/libxfs/xfs_dir2_node.c | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index 2daf874..f1bb343 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -1012,7 +1012,7 @@ xfs_dir2_leafn_rebalance(
> int oldstale; /* old count of stale leaves */
> #endif
> int oldsum; /* old total leaf count */
> - int swap; /* swapped leaf blocks */
> + int swap_blocks; /* swapped leaf blocks */
> struct xfs_dir2_leaf_entry *ents1;
> struct xfs_dir2_leaf_entry *ents2;
> struct xfs_dir3_icleaf_hdr hdr1;
> @@ -1023,13 +1023,10 @@ xfs_dir2_leafn_rebalance(
> /*
> * If the block order is wrong, swap the arguments.
> */
> - if ((swap = xfs_dir2_leafn_order(dp, blk1->bp, blk2->bp))) {
> - xfs_da_state_blk_t *tmp; /* temp for block swap */
> + swap_blocks = xfs_dir2_leafn_order(dp, blk1->bp, blk2->bp);
> + if (swap_blocks)
> + swap(blk1, blk2);
>
> - tmp = blk1;
> - blk1 = blk2;
> - blk2 = tmp;
> - }
> leaf1 = blk1->bp->b_addr;
> leaf2 = blk2->bp->b_addr;
> dp->d_ops->leaf_hdr_from_disk(&hdr1, leaf1);
> @@ -1093,11 +1090,11 @@ xfs_dir2_leafn_rebalance(
> * Mark whether we're inserting into the old or new leaf.
> */
> if (hdr1.count < hdr2.count)
> - state->inleaf = swap;
> + state->inleaf = swap_blocks;
> else if (hdr1.count > hdr2.count)
> - state->inleaf = !swap;
> + state->inleaf = !swap_blocks;
> else
> - state->inleaf = swap ^ (blk1->index <= hdr1.count);
> + state->inleaf = swap_blocks ^ (blk1->index <= hdr1.count);
> /*
> * Adjust the expected index for insertion.
> */
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-17 17:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-17 16:11 [PATCH] xfs: use swap macro in xfs_dir2_leafn_rebalance Gustavo A. R. Silva
2018-07-17 17:14 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).