aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2018-07-11 22:26:38 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2018-07-17 14:25:57 -0700
commit1d5bebbafc73d82e5af003cdd2bf8ee5741cd1df (patch)
treefe8d62d9d14fe01e7c327b2802c517f277c2ab1d /fs/xfs
parentxfs: don't assume a left rmap when allocating a new rmap (diff)
downloadlinux-dev-1d5bebbafc73d82e5af003cdd2bf8ee5741cd1df.tar.xz
linux-dev-1d5bebbafc73d82e5af003cdd2bf8ee5741cd1df.zip
xfs_attr_leaf: use swap macro in xfs_attr3_leaf_rebalance
Make use of the swap macro and remove some unnecessary variables. This makes the code easier to read and maintain. Also, reduces the stack usage. This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/libxfs/xfs_attr_leaf.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index 251304f3bc5d..8ff287979a8c 100644
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -1566,17 +1566,10 @@ xfs_attr3_leaf_rebalance(
*/
swap = 0;
if (xfs_attr3_leaf_order(blk1->bp, &ichdr1, blk2->bp, &ichdr2)) {
- struct xfs_da_state_blk *tmp_blk;
- struct xfs_attr3_icleaf_hdr tmp_ichdr;
+ swap(blk1, blk2);
- tmp_blk = blk1;
- blk1 = blk2;
- blk2 = tmp_blk;
-
- /* struct copies to swap them rather than reconverting */
- tmp_ichdr = ichdr1;
- ichdr1 = ichdr2;
- ichdr2 = tmp_ichdr;
+ /* swap structures rather than reconverting them */
+ swap(ichdr1, ichdr2);
leaf1 = blk1->bp->b_addr;
leaf2 = blk2->bp->b_addr;