From: Fabian Frederick <fabf@skynet.be>
To: linux-kernel@vger.kernel.org
Cc: Fabian Frederick <fabf@skynet.be>,
Dave Chinner <david@fromorbit.com>,
xfs@oss.sgi.com
Subject: [PATCH 4/4 linux-next] xfs: use swap() in xfs_da3_node_rebalance()
Date: Mon, 18 May 2015 19:13:51 +0200 [thread overview]
Message-ID: <1431969231-12834-4-git-send-email-fabf@skynet.be> (raw)
In-Reply-To: <1431969231-12834-1-git-send-email-fabf@skynet.be>
Use kernel.h macro definition.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
fs/xfs/libxfs/xfs_da_btree.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index 2385f8c..f0101a8 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -734,7 +734,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;
@@ -764,9 +763,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);
dp->d_ops->node_hdr_from_disk(&nodehdr1, node1);
dp->d_ops->node_hdr_from_disk(&nodehdr2, node2);
btree1 = dp->d_ops->node_tree_p(node1);
--
2.4.0
next prev parent reply other threads:[~2015-05-18 17:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 17:13 [PATCH 1/4 linux-next] xfs: use swap() in xfs_dir2_leafn_rebalance() Fabian Frederick
2015-05-18 17:13 ` [PATCH 2/4 linux-next] xfs: use swap() in xfs_lock_two_inodes() Fabian Frederick
2015-05-18 17:13 ` [PATCH 3/4 linux-next] xfs: use swap() in xfs_attr3_leaf_rebalance() Fabian Frederick
2015-05-18 17:13 ` Fabian Frederick [this message]
2015-05-18 17:19 ` [PATCH 1/4 linux-next] xfs: use swap() in xfs_dir2_leafn_rebalance() Al Viro
2015-05-18 18:06 ` Fabian Frederick
2015-05-18 21:37 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431969231-12834-4-git-send-email-fabf@skynet.be \
--to=fabf@skynet.be \
--cc=david@fromorbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®