From patchwork Tue Jul 31 16:04:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Netes X-Patchwork-Id: 1261061 X-Patchwork-Delegate: alexne@voltaire.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C6DBCDF26F for ; Tue, 31 Jul 2012 16:09:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755487Ab2GaQJp (ORCPT ); Tue, 31 Jul 2012 12:09:45 -0400 Received: from mail-vb0-f46.google.com ([209.85.212.46]:54893 "EHLO mail-vb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755054Ab2GaQJo (ORCPT ); Tue, 31 Jul 2012 12:09:44 -0400 Received: by mail-vb0-f46.google.com with SMTP id ff1so5920363vbb.19 for ; Tue, 31 Jul 2012 09:09:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=dEGVRlsXnDDpiJN65WVpEDTJ+kavKn4U6f+UMSEUZ2Y=; b=ifno2FGAWDLFAbeTuNS0evCkGcBvSKyy7FJBXUmf1jCXIdgFk3vnqHMYFGvFI9l6Iv fyAtF5hFN3x79AXm06XnafZYgxnQKGsNAQs0WVTnCpHbfj5fIzdKkczbolWZHH5Im4mH TsZA/XnP93HCbX9RusB4+9h91tTZCmgiQRMCbl/dVgHFQ6UGtxL9T8VyeMFMB8yIa6n9 gsCFtLQew9Po+U94tdnHydqfAuYIIvXfK8+k1JJWuRECsqsWsOR+fo6SdC79JuIbAert fB6B5Ye4po9/SeHyeowRU+zBfTIo5fkm/tLn9wP2+9aJ8uy/WEaAAXtDJEOVg0gO2cth hbqA== Received: by 10.52.72.99 with SMTP id c3mr12919219vdv.54.1343750984190; Tue, 31 Jul 2012 09:09:44 -0700 (PDT) Received: from localhost ([193.47.165.251]) by mx.google.com with ESMTPS id ek5sm431902vdb.5.2012.07.31.09.09.42 (version=SSLv3 cipher=OTHER); Tue, 31 Jul 2012 09:09:43 -0700 (PDT) From: Alex Netes To: linux-rdma@vger.kernel.org Cc: Alex Netes , Vladimir Koushnir , Hal Rosenstock Subject: [PATCH 27/27] Call drop manager before checking for other Master SM in the fabric Date: Tue, 31 Jul 2012 19:04:55 +0300 Message-Id: <1343750695-28063-27-git-send-email-alexne@mellanox.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1343750695-28063-1-git-send-email-alexne@mellanox.com> References: <1343750695-28063-1-git-send-email-alexne@mellanox.com> X-Gm-Message-State: ALoCoQmUhR08eIKub4AusntSnnLGIgYDgAj2SkxVZlL6JylGCvWyexq5ZRgqFd/aqZDEne9rEQHm Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org We need to clean the database from dropped nodes/ports even in the cases where we find other Master SM and might leave the do_sweep function. Signed-off-by: Vladimir Koushnir Signed-off-by: Alex Netes Signed-off-by: Hal Rosenstock --- opensm/osm_state_mgr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opensm/osm_state_mgr.c b/opensm/osm_state_mgr.c index 183be36..191d87f 100644 --- a/opensm/osm_state_mgr.c +++ b/opensm/osm_state_mgr.c @@ -1272,6 +1272,8 @@ repeat_discovery: OSM_LOG_MSG_BOX(sm->p_log, OSM_LOG_VERBOSE, "HEAVY SWEEP COMPLETE"); + osm_drop_mgr_process(sm); + /* If we are MASTER - get the highest remote_sm, and * see if it is higher than our local sm. */ @@ -1304,9 +1306,6 @@ repeat_discovery: } } - /* Need to continue with lid assignment */ - osm_drop_mgr_process(sm); - /* * If we are not MASTER already - this means that we are * in discovery state. call osm_sm_state_mgr with signal