From patchwork Tue Aug 11 22:22:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Ricardo Leitner X-Patchwork-Id: 506233 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 442A014027C for ; Wed, 12 Aug 2015 08:22:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932969AbbHKWWt (ORCPT ); Tue, 11 Aug 2015 18:22:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38711 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932675AbbHKWWp (ORCPT ); Tue, 11 Aug 2015 18:22:45 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 0758419CB81; Tue, 11 Aug 2015 22:22:45 +0000 (UTC) Received: from localhost.localdomain.com (vpn1-7-233.gru2.redhat.com [10.97.7.233]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t7BMMYMR025607; Tue, 11 Aug 2015 18:22:43 -0400 From: Marcelo Ricardo Leitner To: cluster-devel@redhat.com Cc: netdev@vger.kernel.org, Vlad Yasevich , Neil Horman , David Teigland , tan.hu@zte.com.cn Subject: [PATCH 3/6] dlm: fix not reconnecting on connecting error handling Date: Tue, 11 Aug 2015 19:22:22 -0300 Message-Id: <299da97baa88cdd50c77dd1683400c52c4769716.1439330654.git.marcelo.leitner@gmail.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If we don't clear that bit, lowcomms_connect_sock() will not schedule another attempt, and no further attempt will be done. Signed-off-by: Marcelo Ricardo Leitner --- fs/dlm/lowcomms.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 749deb3b69b2932fb18e7ae70c06e4ced15bd9b6..54a0031067de3ae6d3cd0106d7b9d4e30c956cfd 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -1253,6 +1253,7 @@ out_err: con->retries, result); mutex_unlock(&con->sock_mutex); msleep(1000); + clear_bit(CF_CONNECT_PENDING, &con->flags); lowcomms_connect_sock(con); return; }