From patchwork Fri Jun 27 18:43:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 365108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F1BBD140087 for ; Sat, 28 Jun 2014 04:43:21 +1000 (EST) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s5RIhIGG028643 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 Jun 2014 18:43:19 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s5RIhI4H025225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 27 Jun 2014 18:43:18 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1X0b7G-0000m9-FQ; Fri, 27 Jun 2014 11:43:18 -0700 Received: from ucsinet22.oracle.com ([156.151.31.94]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1X0b7C-0000ly-8S for fedfs-utils-devel@oss.oracle.com; Fri, 27 Jun 2014 11:43:14 -0700 Received: from userp1030.oracle.com (userp1030.oracle.com [156.151.31.80]) by ucsinet22.oracle.com (8.14.5+Sun/8.14.5) with ESMTP id s5RIhD8j024424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Fri, 27 Jun 2014 18:43:14 GMT Received: from mail-ie0-f178.google.com (mail-ie0-f178.google.com [209.85.223.178]) by userp1030.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s5RIhC3s012137 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Fri, 27 Jun 2014 18:43:13 GMT Authentication-Results: userp1030.oracle.com; dkim=pass reason="2048-bit key" header.d=gmail.com header.i=@gmail.com header.b=WZnZAD9E Received: by mail-ie0-f178.google.com with SMTP id rd18so4597659iec.23 for ; Fri, 27 Jun 2014 11:43:12 -0700 (PDT) X-Received: by 10.42.109.79 with SMTP id k15mr22458591icp.15.1403894592507; Fri, 27 Jun 2014 11:43:12 -0700 (PDT) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe44:ec31]) by mx.google.com with ESMTPSA id ky9sm15749038igb.13.2014.06.27.11.43.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jun 2014 11:43:12 -0700 (PDT) To: fedfs-utils-devel@oss.oracle.com From: Chuck Lever Date: Fri, 27 Jun 2014 14:43:11 -0400 Message-ID: <20140627184311.52216.56745.stgit@seurat.1015granger.net> In-Reply-To: <20140627184201.52216.94080.stgit@seurat.1015granger.net> References: <20140627184201.52216.94080.stgit@seurat.1015granger.net> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Flow-Control-Info: class=Pass-to-MM reputation=ipRisk-All ip=209.85.223.178 ct-class=R5 ct-vol1=-95 ct-vol2=8 ct-vol3=7 ct-risk=41 ct-spam1=61 ct-spam2=7 ct-bulk=6 rcpts=1 size=1365 X-Sendmail-CM-Score: 0.00% X-Sendmail-CM-Analysis: v=2.1 cv=cfDr8BzM c=1 sm=1 tr=0 a=XiJxhbrgfywKHC6CwWIl2A==:117 a=dzsqy3y4QnMA:10 a=UuZ4CLHoTq0A:10 a=dPGociXpb70A:10 a=IkcTkHD0fZMA:10 a=xqWC_Br6kY4A:10 a=yPCof4ZbAAAA:8 a=Lb1rMZzfAAAA:8 a=1XWaLZrsAAAA:8 a=YPrE00L9qevcixSTQesA:9 a=QEXdDO 2ut3YA:10 a=7DSvI1NPTFQA:10 X-Sendmail-CT-RefID: str=0001.0A090207.53ADBB41.00C5, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-Sendmail-CT-Classification: not spam Subject: [fedfs-utils] [PATCH 7/9] libnsdb: Remove dead code from nsdb_new_get_ncedn_s() X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] Fixes: ea9cadee (libnsdb: simplify NCE discovery) Signed-off-by: Chuck Lever --- src/libnsdb/fileserver.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c index d217bfea3769..244a30976330 100644 --- a/src/libnsdb/fileserver.c +++ b/src/libnsdb/fileserver.c @@ -512,7 +512,6 @@ nsdb_new_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn) LDAPMessage *response, *message; LDAP *ld = host->fn_ldap; FedFsStatus retval; - unsigned count; int entries; host->fn_ldaperr = nsdb_search_nsdb_all_s(ld, naming_context, @@ -555,17 +554,11 @@ nsdb_new_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn) } retval = FEDFS_OK; - for (message = ldap_first_message(ld, response), count = 0; + for (message = ldap_first_message(ld, response); message != NULL && retval == FEDFS_OK; message = ldap_next_message(ld, message)) { switch (ldap_msgtype(message)) { case LDAP_RES_SEARCH_ENTRY: - if (++count > 1) { - xlog(D_CALL, "%s: more than one NCE under %s", - __func__, naming_context); - retval = FEDFS_ERR_NSDB_NONCE; - goto out; - } retval = nsdb_parse_ncedn(ld, message, dn); if (retval == FEDFS_OK) xlog(D_CALL, "%s: %s contains NCE %s",