aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Guang <yang.guang5@zte.com.cn>2022-04-28 15:39:04 -0400
committerEric Sandeen <sandeen@sandeen.net>2022-04-28 15:39:04 -0400
commit016bb3d18d24ccf5709deafbc6e928cbeb92a160 (patch)
treea064f7045332f21356ce7ea8aa7686e4b72d68fb
parent63b67bb6d0145c3ee225725e7fc5c047cd6c5065 (diff)
downloadxfsprogs-dev-016bb3d18d24ccf5709deafbc6e928cbeb92a160.tar.gz
xfs: use swap() to make dabtree code cleaner
Source kernel commit: 5b068aadf62da006891383f6b23e47bc3ad49995 Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid opencoding it. Reported-by: Zeal Robot <zealci@zte.com.cn> Signed-off-by: Yang Guang <yang.guang5@zte.com.cn> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r--libxfs/xfs_da_btree.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 50f3ec661a..1f39c10878 100644
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -861,7 +861,6 @@ xfs_da3_node_rebalance(
{
struct xfs_da_intnode *node1;
struct xfs_da_intnode *node2;
- struct xfs_da_intnode *tmpnode;
struct xfs_da_node_entry *btree1;
struct xfs_da_node_entry *btree2;
struct xfs_da_node_entry *btree_s;
@@ -891,9 +890,7 @@ xfs_da3_node_rebalance(
((be32_to_cpu(btree2[0].hashval) < be32_to_cpu(btree1[0].hashval)) ||
(be32_to_cpu(btree2[nodehdr2.count - 1].hashval) <
be32_to_cpu(btree1[nodehdr1.count - 1].hashval)))) {
- tmpnode = node1;
- node1 = node2;
- node2 = tmpnode;
+ swap(node1, node2);
xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr1, node1);
xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr2, node2);
btree1 = nodehdr1.btree;