staging: lustre: fixed shadowed variable in socklnd_cb.c
PATCH v2 1/1 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 <[email protected]>
--- drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c +2 -2
@@ -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)) {
Signature · 1 line
2.1.4
Quoted 7 lines · Andrew Kanner
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 hereSigned-off-by Andrew Kanner <[email protected]>
Reviewed-by Andreas Dilger <[email protected]>
Quoted 22 lines
---
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c +2
-2@@ -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)) {Signature · 1 line
2.1.4
Quoted 5 lines
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
Reviewed-by James Simmons <[email protected]>
Quoted 24 lines
Signed-off-by Andrew Kanner <[email protected]>--- drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c +2
-2@@ -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)) {Signature · 1 line
2.1.4