[fedfs-utils] [PATCH 2/7] Remove fedfsFslTTL attribute
Chuck Lever
chuck.lever at oracle.com
Tue Nov 20 12:26:43 PST 2012
The fedfsFsl object class defined in the latest NSDB schema no
longer contains a TTL attribute.
Signed-off-by: Chuck Lever <chuck.lever at oracle.com>
---
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;
More information about the fedfs-utils-devel
mailing list