From patchwork Tue Nov 20 20:26:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 200506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "userp1040.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 4A8C72C007C for ; Wed, 21 Nov 2012 07:27:10 +1100 (EST) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAKKR3pi027270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Nov 2012 20:27:04 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAKKR2xf001386 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Nov 2012 20:27:03 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TauPO-0002C9-Sg; Tue, 20 Nov 2012 12:27:02 -0800 Received: from ucsinet21.oracle.com ([156.151.31.93]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TauPA-0002BJ-7P for fedfs-utils-devel@oss.oracle.com; Tue, 20 Nov 2012 12:26:48 -0800 Received: from acsinet12.oracle.com (acsinet12.oracle.com [141.146.126.234]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAKKQkpf019266 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Nov 2012 20:26:47 GMT Received: from mail-ia0-f171.google.com (mail-ia0-f171.google.com [209.85.210.171]) by acsinet12.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAKKQjXB026864 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Tue, 20 Nov 2012 20:26:46 GMT Received: by mail-ia0-f171.google.com with SMTP id b35so2152578iac.2 for ; Tue, 20 Nov 2012 12:26:45 -0800 (PST) Received: by 10.50.36.200 with SMTP id s8mr5755024igj.23.1353443205338; Tue, 20 Nov 2012 12:26:45 -0800 (PST) Received: from seurat.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net. [99.26.161.222]) by mx.google.com with ESMTPS id cg5sm5779700igb.8.2012.11.20.12.26.44 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Nov 2012 12:26:44 -0800 (PST) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Tue, 20 Nov 2012 15:26:43 -0500 Message-ID: <20121120202643.47389.42344.stgit@seurat.1015granger.net> In-Reply-To: <20121120201753.47389.51902.stgit@seurat.1015granger.net> References: <20121120201753.47389.51902.stgit@seurat.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Flow-Control-Info: class=Default reputation=ipRepBelow100 ip=209.85.210.171 ct-class=R5 ct-vol1=0 ct-vol2=8 ct-vol3=7 ct-risk=50 ct-spam1=80 ct-spam2=7 ct-bulk=6 rcpts=1 size=4560 X-MM-CT-Classification: not spam X-MM-CT-RefID: str=0001.0A090203.50ABE786.0071,ss=1,re=0.000,fgs=0 Subject: [fedfs-utils] [PATCH 2/7] Remove fedfsFslTTL attribute 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: acsinet22.oracle.com [141.146.126.238] The fedfsFsl object class defined in the latest NSDB schema no longer contains a TTL attribute. Signed-off-by: Chuck Lever --- doc/man/nsdb-resolve-fsn.8 | 2 -- src/include/nsdb.h | 1 - src/libnsdb/administrator.c | 3 --- src/libnsdb/fileserver.c | 4 ---- src/nfsref/lookup.c | 1 - src/nsdbc/nsdb-resolve-fsn.c | 1 - src/plug-ins/nfs-plugin.c | 1 - 7 files changed, 0 insertions(+), 13 deletions(-) diff --git a/doc/man/nsdb-resolve-fsn.8 b/doc/man/nsdb-resolve-fsn.8 index d00e7aa..aa8647c 100644 --- a/doc/man/nsdb-resolve-fsn.8 +++ b/doc/man/nsdb-resolve-fsn.8 @@ -259,8 +259,6 @@ dn: fedfsFslUuid=323c5068-7c11-11e0-8d38-000c297fd679, FSL UUID: 323c5068-7c11-11e0-8d38-000c297fd679 .br FSL host: fileserver.example.net -.br - TTL: 300 .sp NFS fli_rootpath: /path .br diff --git a/src/include/nsdb.h b/src/include/nsdb.h index 6baa317..58a5d52 100644 --- a/src/include/nsdb.h +++ b/src/include/nsdb.h @@ -88,7 +88,6 @@ struct fedfs_fsl { char fl_fsnuuid[FEDFS_UUID_STRLEN]; char fl_fslhost[NI_MAXHOST + 1]; int fl_fslport; - int fl_fslttl; char **fl_annotations; char **fl_description; diff --git a/src/libnsdb/administrator.c b/src/libnsdb/administrator.c index 6c32d0f..ab5e0b0 100644 --- a/src/libnsdb/administrator.c +++ b/src/libnsdb/administrator.c @@ -559,7 +559,6 @@ nsdb_create_nfs_fsl_entry_s(LDAP *ld, const char *nce, struct fedfs_fsl *fsl, struct fedfs_nfs_fsl *nfsfsl = &fsl->fl_u.fl_nfsfsl; char *ocvals[3], *fsluuidvals[2], *fsnuuidvals[2]; char *servernamevals[2], *serverportvals[2], serverportbuf[12]; - char *ttyvals[2], ttybuf[12]; /* XXX: variables for encoding annotations and description * attributes would go here */ @@ -605,8 +604,6 @@ nsdb_create_nfs_fsl_entry_s(LDAP *ld, const char *nce, struct fedfs_fsl *fsl, nsdb_init_add_attribute(attrs[i++], "fedfsFslPort", serverportvals, serverportbuf); } - sprintf(ttybuf, "%d", fsl->fl_fslttl); - nsdb_init_add_attribute(attrs[i++], "fedfsFslTTL", ttyvals, ttybuf); retval = nsdb_path_array_to_xdr(nfsfsl->fn_nfspath, &xdr_path); if (retval != FEDFS_OK) diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c index cba49fb..9ec0f37 100644 --- a/src/libnsdb/fileserver.c +++ b/src/libnsdb/fileserver.c @@ -161,7 +161,6 @@ nsdb_new_fedfs_fsl(FedFsFslType type) } new->fl_type = type; - new->fl_fslttl = 300; return new; } @@ -662,9 +661,6 @@ nsdb_resolve_fsn_parse_attribute(LDAP *ld, LDAPMessage *entry, char *attr, else if (strcasecmp(attr, "fedfsFslPort") == 0) retval = nsdb_parse_singlevalue_int(attr, values, &fsl->fl_fslport); - else if (strcasecmp(attr, "fedfsFslTTL") == 0) - retval = nsdb_parse_singlevalue_int(attr, values, - &fsl->fl_fslttl); else if (strcasecmp(attr, "fedfsAnnotation") == 0) retval = nsdb_parse_annotations(values, fsl); else if (strcasecmp(attr, "fedfsDescr") == 0) diff --git a/src/nfsref/lookup.c b/src/nfsref/lookup.c index ef64b9f..2c34090 100644 --- a/src/nfsref/lookup.c +++ b/src/nfsref/lookup.c @@ -216,7 +216,6 @@ nfsref_lookup_display_fedfs_fsl(struct fedfs_fsl *fsl) printf("\tfedfsFsnUuid:\t\t\t%s\n", fsl->fl_fsnuuid); printf("\tfedfsFslHost:\t\t\t%s\n", fsl->fl_fslhost); printf("\tfedfsFslPort:\t\t\t%u\n", fsl->fl_fslport); - printf("\tfedfsFslTTL:\t\t\t%d\n", fsl->fl_fslttl); if (fsl->fl_annotations != NULL) { for (i = 0; fsl->fl_annotations[i] != NULL; i++) diff --git a/src/nsdbc/nsdb-resolve-fsn.c b/src/nsdbc/nsdb-resolve-fsn.c index b877298..aead4f7 100644 --- a/src/nsdbc/nsdb-resolve-fsn.c +++ b/src/nsdbc/nsdb-resolve-fsn.c @@ -155,7 +155,6 @@ nsdb_resolve_fsn_display_fsl(struct fedfs_fsl *fsl) printf(" FSL host:\t\t%s\n", fsl->fl_fslhost); else printf(" FSL host:\t\t%s:%u\n", fsl->fl_fslhost, fsl->fl_fslport); - printf(" TTL:\t\t\t%d\n\n", fsl->fl_fslttl); if (fsl->fl_annotations != NULL) { for (i = 0; fsl->fl_annotations[i] != NULL; i++) diff --git a/src/plug-ins/nfs-plugin.c b/src/plug-ins/nfs-plugin.c index fb6f4c5..767d660 100644 --- a/src/plug-ins/nfs-plugin.c +++ b/src/plug-ins/nfs-plugin.c @@ -260,7 +260,6 @@ nfs_jp_convert_fedfs_fsl(struct fedfs_fsl *fsl, struct nfs_fsloc **fsloc) } new->nfl_hostport = fsl->fl_fslport; - new->nfl_ttl = fsl->fl_fslttl; new->nfl_flags.nfl_varsub = nfs_fsl->fn_varsub; new->nfl_currency = nfs_fsl->fn_currency;