From patchwork Wed Oct 28 09:54:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Kliteynik X-Patchwork-Id: 56258 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9S9oOlP005944 for ; Wed, 28 Oct 2009 09:50:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751845AbZJ1JuT (ORCPT ); Wed, 28 Oct 2009 05:50:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751915AbZJ1JuS (ORCPT ); Wed, 28 Oct 2009 05:50:18 -0400 Received: from mail.mellanox.co.il ([194.90.237.43]:47575 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751845AbZJ1JuR (ORCPT ); Wed, 28 Oct 2009 05:50:17 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from kliteyn@dev.mellanox.co.il) with SMTP; 28 Oct 2009 11:55:19 +0200 Received: from [10.4.1.29] ([10.4.1.29]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 28 Oct 2009 11:50:20 +0200 Message-ID: <4AE814E3.4090405@dev.mellanox.co.il> Date: Wed, 28 Oct 2009 11:54:43 +0200 From: Yevgeny Kliteynik Reply-To: kliteyn@dev.mellanox.co.il User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: Sasha Khapyorsky CC: Linux RDMA Subject: [PATCH] opensm/osm_sa.c: don't ignore failure in osm_mgrp_add_port() X-OriginalArrivalTime: 28 Oct 2009 09:50:20.0283 (UTC) FILETIME=[0FB684B0:01CA57B4] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/opensm/osm_sa.c b/opensm/opensm/osm_sa.c index a124a45..7b9340d 100644 --- a/opensm/opensm/osm_sa.c +++ b/opensm/opensm/osm_sa.c @@ -1002,9 +1002,10 @@ int osm_sa_db_file_load(osm_opensm_t * p_osm) port = osm_get_port_by_guid(&p_osm->subn, guid); if (port && cl_qmap_get(&p_mgrp->mcm_port_tbl, guid) == - cl_qmap_end(&p_mgrp->mcm_port_tbl)) - osm_mgrp_add_port(&p_osm->subn, &p_osm->log, - p_mgrp, port, &mcmr, proxy); + cl_qmap_end(&p_mgrp->mcm_port_tbl) && + !osm_mgrp_add_port(&p_osm->subn, &p_osm->log, + p_mgrp, port, &mcmr, proxy)) + rereg_clients = 1; } else if (!strncmp(p, "Service Record:", 15)) { ib_service_record_t s_rec; uint32_t modified_time, lease_period;