]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
staging: lustre: fixed shadowed variable in socklnd_cb.c
authorAndrew Kanner <andrew.kanner@gmail.com>
Thu, 3 Nov 2016 22:49:46 +0000 (01:49 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Nov 2016 10:40:49 +0000 (11:40 +0100)
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>
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

index c1c6f604e6ada9d7291b7d998085aaf77b487e10..f31f4a19705b546b2b5aa72fc691b3b234e5ed36 100644 (file)
@@ -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)) {