summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Kanner <andrew.kanner@gmail.com>2016-11-03 23:49:46 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-07 11:40:49 +0100
commit993403b9798123db4eb9d9bba1ab41f388dc1ea1 (patch)
tree6683774529725a327945be6b0e2f9f59f017a638
parentstaging: lustre: o2iblnd: replace space indentation with tabs (diff)
downloadlinux-993403b9798123db4eb9d9bba1ab41f388dc1ea1.tar.xz
linux-993403b9798123db4eb9d9bba1ab41f388dc1ea1.zip
staging: lustre: fixed shadowed variable in socklnd_cb.c
Removed redundant declaration of variable 'tx' in local scope Fixed: sparse warning: socklnd_cb.c:2476:41: warning: symbol 'tx' shadows an earlier one socklnd_cb.c:2435:25: originally declared here Signed-off-by: Andrew Kanner <andrew.kanner@gmail.com> Reviewed-by: James Simmons <jsimmons@infradead.org> Reviewed-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
index c1c6f604e6ad..f31f4a19705b 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
@@ -2473,8 +2473,8 @@ ksocknal_check_peer_timeouts(int idx)
* holding only shared lock
*/
if (!list_empty(&peer->ksnp_tx_queue)) {
- struct ksock_tx *tx = list_entry(peer->ksnp_tx_queue.next,
- struct ksock_tx, tx_list);
+ tx = list_entry(peer->ksnp_tx_queue.next,
+ struct ksock_tx, tx_list);
if (cfs_time_aftereq(cfs_time_current(),
tx->tx_deadline)) {