Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Yihao Han <hanyihao@vivo.com>
To:     "Darrick J. Wong" <djwong@kernel.org>, linux-xfs@vger.kernel.org,
        Dave Chinner <dchinner@redhat.com>,
        Yihao Han <hanyihao@vivo.com>,
        "Gustavo A. R. Silva" <gustavoars@kernel.org>,
        linux-kernel@vger.kernel.org
Cc:     kernel@vivo.com
Subject: [PATCH] xfs:using swap() instead of tmp variable
Date:   Mon,  1 Nov 2021 05:28:47 -0700
Message-Id: <20211101122848.27029-1-hanyihao@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ks95R+Vx0oFpqlNxzTAu6vJq2bl4/9Cpf/lbFcXItdL86iWMqglbMkGS1+hV?=
 =?us-ascii?Q?ETXuACIPLuCd4bQz0OFKnseKtsV43+tL4MVh/6q90Nixc68xwMksvnLbiDKq?=
 =?us-ascii?Q?zi4ankzwEwU9o5NkJYifiPSBRGpvshrctv29BjuEPtNgQLbCvggfyfubZPYc?=
 =?us-ascii?Q?CcXKRXjYAsIDY0ED7O4KUSGqMKM8VBxDs8mmtwy913xSno3L8rVz6Q7hCq8L?=
 =?us-ascii?Q?JRrtfDvT/0VVc4SFu9Jj7spjj5mrTCWtNylKFhP/87zImAIabPUFKjm5ohWh?=
 =?us-ascii?Q?Lv/N9ezLiM313jHXbEkb99r/eUTScn9HUYnMYbCTUH72FQiivvTvRsGFcDQZ?=
 =?us-ascii?Q?hUtQ4LCOqZES30rQqF4bliJYdRV+riZXm6LKBI8DF23VDhpAzdWLmOKTr33Z?=
 =?us-ascii?Q?/gDHK5yAvxKnw/4ecrfjsfZnjtDqgHsKDTTPfpi3V/WH1TFn7zF5udEN57Rr?=
 =?us-ascii?Q?JqX60VsV9IK7nZqaOK+O+JqoopWp/Q07xPCfVx/yV+qQZZWw2YcG/BctKL3S?=
 =?us-ascii?Q?vGH9pnow60rWFLAPUBC8DhAmPjzKZb3JKGeRaehPAEupoUFraVpcz6pmNZV3?=
 =?us-ascii?Q?JS6jQGagmhsu6kwpxbPL9+0WSlOu+dYVE+yTy7+QyNc5k3YSo9aXKZjCy8yH?=
 =?us-ascii?Q?jSuLZQQQQtSH6t3LCXuei/mUUqkpFkPHds56mKKH3K2UHjMCyHd0tCrrfAAU?=
 =?us-ascii?Q?UCQQ++qY853is9Qet+gHvNDzrLrRfiJxKpsaC2kMchSsle4U20BJX4kctfxT?=
 =?us-ascii?Q?/A503CKS0OIWz2WSK0qYffjtHqFf/vmm4o+8v/cCEAOr47PdFdUNvijMrz89?=
 =?us-ascii?Q?ZTGV80f+rhD8DeXIoO7MxLi22zZy9dJq+KrK11p9dcHs/AxkXkrfEJrE8Zl0?=
 =?us-ascii?Q?wQxw0aGz7eLkPiviw0ie2bQAqv5P0KrA8eSjQJjvcEkMvr9+zgbp9W/jL9SU?=
 =?us-ascii?Q?228KcO8PnlZfiP/RjoQH+WnJq1+nJz0O7TJF8kDvWe5RIZ1QypIE1K2WVlfJ?=
 =?us-ascii?Q?BsQZVuWdjwFepOkxPIssfBj5WW6lLxnw5cuBDgmRL4E/Rl1vF22s4WYlcUZx?=
 =?us-ascii?Q?B1JkHSD1lQCFrhrCUlls9OoGr+E3ExEGgCbNjDbnszwYOk9UE48N6PqxXPaQ?=
 =?us-ascii?Q?lO1DnOh4RRU9z1Wd19pXhz8fVeZ2K9lvHUMFATt2wE3Ttmjbg+fPoP3SfEMz?=
 =?us-ascii?Q?130z8kueLwRb7iFRcORXVWqcOIMkfc0jeXh4KLcJuUkTGJbiq8jKEM/VKH5j?=
 =?us-ascii?Q?sgDQoNa7ssBM61/HI75DfI9VKQedU2nsrxffLivucV7dPNsiECjj6D7Oxeck?=
 =?us-ascii?Q?r7buVFsmZ9qiWIDWpyzTXnYf8bSJBYpdTBiVWfVOZ5MVIndKDcSgm2PZjAJK?=
 =?us-ascii?Q?fBdbulYv87DxHq5k+ieaAPYDDBrY3VI7t4HCDqfk+J3fljhBsIatvSRH8ave?=
 =?us-ascii?Q?GtqZzyDvG9q03sAhlKedwPOKTuTzuh25G7yVQXdwRxa+6yZWAW0gHAW6C93T?=
 =?us-ascii?Q?IDaiyKG+vw9U8DwCQDl03rsneYyKGYGuDWEgu2OhZaJf9bJjgSZCQCZye9F2?=
 =?us-ascii?Q?X1rs2vuZKQU9PIgqKNZBv84SsjONeTAzoRUtCp+0Z/xyh290ikbNxyzm9BOM?=
 =?us-ascii?Q?huvS8WEkSfwut85Vu5TSMRE=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ede0abcb-f4c1-4e9c-068f-08d99d333755
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4173.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2021 12:29:14.7923
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Shkp8mAE17oEMTi6+4fXlwEp5s5T+H95EsyZ3ok9GK/OSlKVT0I1twb9xBMzxPWaBWkcJhVrnLrHuOl/fRcHvw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR06MB2734
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

swap() was used instead of the tmp variable to swap values

Signed-off-by: Yihao Han <hanyihao@vivo.com>
---
 fs/xfs/libxfs/xfs_da_btree.c |  5 +----
 fs/xfs/xfs_inode.c           | 10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index c062e2c85178..f3608884c076 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -864,7 +864,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;
@@ -894,9 +893,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;
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index a4f6f034fb81..518c82bfc80d 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -564,8 +564,6 @@ xfs_lock_two_inodes(
 	struct xfs_inode	*ip1,
 	uint			ip1_mode)
 {
-	struct xfs_inode	*temp;
-	uint			mode_temp;
 	int			attempts = 0;
 	struct xfs_log_item	*lp;
 
@@ -578,12 +576,8 @@ xfs_lock_two_inodes(
 	ASSERT(ip0->i_ino != ip1->i_ino);
 
 	if (ip0->i_ino > ip1->i_ino) {
-		temp = ip0;
-		ip0 = ip1;
-		ip1 = temp;
-		mode_temp = ip0_mode;
-		ip0_mode = ip1_mode;
-		ip1_mode = mode_temp;
+		swap(ip0, ip1);
+		swap(ip0_mode, ip1_mode);
 	}
 
  again:
-- 
2.17.1