mountd cleanup
Subsystems (2)
cover mountd cleanup
Hi Steve-
These four patches clean up some spots in libexport.a. They are pre-requisites for mountd/exportfs IPv6 support.
---
Chuck Lever (4):
libexport.a: e_fslocdata should be freed with free(3) libexport.a: Fix whitespace damage in support/export/export.c libexport.a: Clean up client_compose() and client_member() libexport.a: Remove dead code
support/export/client.c | 65 ++++++++++++++++++-------------------------- support/export/export.c | 13 +++++---- support/include/exportfs.h | 5 +-- 3 files changed, 36 insertions(+), 47 deletions(-)
Signature · 1 line
Chuck Lever
A message that is not in the archive (sent off-list or not yet received): 20100322003317.30360.18289.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
PATCH 1/4 libexport.a: Remove dead code
Clean up: I can't find any call sites for client_find() or client_match().
---
support/export/client.c | 22 ---------------------- support/include/exportfs.h | 2 -- 2 files changed, 0 insertions(+), 24 deletions(-)
support/export/client.c +0 -22
@@ -211,28 +211,6 @@ client_freeall(void) } } -nfs_client * -client_find (struct hostent *hp) -{ -nfs_client *clp; -int i; - -for (i =0 ; i <MCL_MAXTYPES ; i++) { -for (clp = clientlist[i]; clp; clp = clp->m_next) { -if (!client_check (clp, hp)) -continue ; -#ifdef notdef -if (clp->m_type ==MCL_FQDN ) -return clp; -return client_dup (clp, hp); -#else -return clp; -#endif - } - } -return NULL ; -} -struct hostent *client_resolve (struct in_addr addr) {
support/include/exportfs.h +0 -2
@@ -69,12 +69,10 @@ extern exp_hash_table exportlist[MCL_MAXTYPES];extern nfs_client * clientlist[MCL_MAXTYPES ];nfs_client *client_lookup (char *hname,int canonical); -nfs_client *client_find (struct hostent *);void client_add (nfs_client *);nfs_client *client_dup (nfs_client *,struct hostent *);int client_gettype (char *hname);int client_check (nfs_client *,struct hostent *); -int client_match (nfs_client *,char *hname);void client_release (nfs_client *);void client_freeall (void );char *client_compose (struct hostent *he);
PATCH 2/4 libexport.a: Clean up client_compose() and client_member()
In reply to a message not in the archiveClean up: Replace outdated comments, and fix some function declarations. Use proper type for a couple of automatic variables.
---
support/export/client.c | 43 +++++++++++++++++++++++++++---------------- support/include/exportfs.h | 3 ++- 2 files changed, 29 insertions(+), 17 deletions(-)
support/export/client.c +27 -16
@@ -28,6 +28,8 @@#if !defined(__GLIBC__) || __GLIBC__ <2 extern int innetgr (char *netgr,char *host,char *,char *);#endif + +static char *add_name (char *old,const char *add);static void client_init (nfs_client *clp,const char *hname,struct hostent *hp);static int client_checkaddr (nfs_client *clp,struct in_addr addr);
@@ -224,14 +226,18 @@ client_resolve(struct in_addr addr)return he; } -/* -* Find client name given an IP address -* This is found by gathering all known names that match that IP address, -* sorting them and joining them with '+' +/** +* client_compose - Make a list of cached hostnames that match an IP address +* @he: pointer to hostent containing IP address information to match +* +* Gather all known client hostnames that match the IP address, and sort +* the result into a comma-separated list. * +* Returns a '\0'-terminated ASCII string containing a comma-separated +* sorted list of client hostnames, or NULL if no client records matched +* the IP address or memory could not be allocated. Caller must free the +* returned string with free(3). */ -static char *add_name (char *old,char *add); -char *client_compose (struct hostent *he) {
@@ -249,13 +255,19 @@ client_compose(struct hostent *he)return name; } +/** +* client_member - check if @name is contained in the list @client +* @client: '\0'-terminated ASCII string containing +* comma-separated list of hostnames +* @name: '\0'-terminated ASCII string containing hostname to look for +* +* Returns 1 if @name was found in @client, otherwise zero is returned. +*/ int -client_member (char *client,char *name) +client_member (const char *client,const char *name) { -/* check if "client" (a ',' separated list of names) -* contains 'name' as a member -*/ -int l =strlen (name); +size_t l =strlen (name); +while (*client) {if (strncmp (client, name, l) ==0 && (client[l] ==',' || client[l] =='\0' ))
@@ -268,9 +280,8 @@ client_member(char *client, char *name)return 0 ; } - -int -name_cmp (char *a,char *b) +static int +name_cmp (const char *a,const char *b) {/* compare strings a and b, but only upto ',' in a */ while (*a && *b && *a !=',' && *a == *b)
@@ -283,9 +294,9 @@ name_cmp(char *a, char *b) }static char * -add_name (char *old,char *add) +add_name (char *old,const char *add) { -int len =strlen (add)+2 ; +size_t len =strlen (add) +2 ;char *new;char *cp;if (old) len +=strlen (old);
support/include/exportfs.h +2 -1
@@ -77,7 +77,8 @@ void client_release(nfs_client *);void client_freeall (void );char *client_compose (struct hostent *he);struct hostent *client_resolve (struct in_addr addr); -int client_member (char *client,char *name); +int client_member (const char *client, +const char *name);int export_read (char *fname);void export_add (nfs_export *);
PATCH 3/4 libexport.a: Fix whitespace damage in support/export/export.c
In reply to a message not in the archiveClean up whitespace damage introduced by commit 4cacc965.
---
support/export/export.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
support/export/export.c +6 -5
@@ -128,6 +128,7 @@ export_dup(nfs_export *exp, struct hostent *hp)return new; } +/* * Add export entry to hash table */
@@ -280,11 +281,11 @@ export_freeall(void)xfree (exp->m_export.e_hostname);xfree (exp); } -for (j =0 ; j <HASH_TABLE_SIZE ; j++) { - exportlist[i].entries[j].p_first =NULL ; - exportlist[i].entries[j].p_last =NULL ; - } - exportlist[i].p_head =NULL ; +for (j =0 ; j <HASH_TABLE_SIZE ; j++) { + exportlist[i].entries[j].p_first =NULL ; + exportlist[i].entries[j].p_last =NULL ; + } + exportlist[i].p_head =NULL ; }client_freeall (); }
PATCH 4/4 libexport.a: e_fslocdata should be freed with free(3)
In reply to a message not in the archiveClean up: Since e_fslocdata is allocated with strdup(3), and not xstrdup(), it should be freed with free(3), and not xfree().
It looks like we could get rid of the "if (thing I'm freeing isn't NULL)" checks too, but that's for another day.
---
support/export/export.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
support/export/export.c +1 -1
@@ -277,7 +277,7 @@ export_freeall(void)if (exp->m_export.e_mountpoint)free (exp->m_export.e_mountpoint);if (exp->m_export.e_fslocdata) -xfree (exp->m_export.e_fslocdata); +free (exp->m_export.e_fslocdata);xfree (exp->m_export.e_hostname);xfree (exp); }
Quoted 14 lines · Chuck Lever
Hi Steve-
These four patches clean up some spots in libexport.a. They are pre-requisites for mountd/exportfs IPv6 support.
---
Chuck Lever (4):
libexport.a:e_fslocdatashould be freed with free(3) libexport.a: Fix whitespace damage insupport/export/export.clibexport.a: Clean upclient_compose()andclient_member()libexport.a: Remove dead code
Quoted 5 lines
support/export/client.c | 65 ++++++++++++++++++-------------------------- support/export/export.c | 13 +++++---- support/include/exportfs.h | 5 +-- 3 files changed, 36 insertions(+), 47 deletions(-)
Committed...
steved.