Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933152AbcKCV5Z (ORCPT ); Thu, 3 Nov 2016 17:57:25 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35649 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752404AbcKCV5Y (ORCPT ); Thu, 3 Nov 2016 17:57:24 -0400 From: Andrew Kanner To: oleg.drokin@intel.com Cc: andreas.dilger@intel.com, jsimmons@infradead.org, gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk, bevans@cray.com, bhaktipriya96@gmail.com, lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: lustre: fixed shadowed variable in socklnd_cb.c Date: Fri, 4 Nov 2016 00:54:19 +0300 Message-Id: <1478210059-6091-1-git-send-email-andrew.kanner@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1145 Lines: 30 Changed variable 'tx' name 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 --- drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 4 ++-- 1 file 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 c1c6f60..03fe4e5 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c @@ -2473,11 +2473,11 @@ 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_entry(peer->ksnp_tx_queue.next, struct ksock_tx, tx_list); if (cfs_time_aftereq(cfs_time_current(), - tx->tx_deadline)) { + _tx->tx_deadline)) { ksocknal_peer_addref(peer); read_unlock(&ksocknal_data.ksnd_global_lock); -- 2.1.4