mountd: Use static buffer when constructing junction export options

Clean up: Simplify locations_to_export() by constructing a junction's
export options in a static buffer.

We can do this because all of this code is called serially, in one
thread, and the result is thrown away immediately after the caller
is finished.  The returned exportent itself is static.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 942fdbd030f19f59665681acde3aeaf06b6dd308..8de2eac383acfe3c74566b6608761506adc1b46c 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -917,14 +917,15 @@ out_false:
  *
  * Returned exportent points to static memory.
  */
  *
  * Returned exportent points to static memory.
  */

-static struct exportent *do_locations_to_export(struct jp_ops *ops,
-               nfs_fsloc_set_t locations, const char *junction,
-               char *options, size_t options_len)
+static struct exportent *locations_to_export(struct jp_ops *ops,
+               nfs_fsloc_set_t locations, const char *junction)

 {
 {

+       static char options[BUFSIZ];

        struct exportent *exp;
        int ttl;
 
        struct exportent *exp;
        int ttl;
 

-       if (!locations_to_options(ops, locations, options, options_len, &ttl))
+       options[0] = '\0';
+       if (!locations_to_options(ops, locations, options, sizeof(options), &ttl))

                return NULL;
 
        exp = mkexportent("*", (char *)junction, options);
                return NULL;
 
        exp = mkexportent("*", (char *)junction, options);


@@ -938,33 +939,6 @@ static struct exportent *do_locations_to_export(struct jp_ops *ops,
        return exp;
 }
 
        return exp;
 }
 

-/*
- * Convert set of FS locations to an exportent.  Returns pointer to
- * an exportent if "junction" refers to a junction.
- *
- * Returned exportent points to static memory.
- */
-static struct exportent *locations_to_export(struct jp_ops *ops,
-               nfs_fsloc_set_t locations, const char *junction)
-{
-       struct exportent *exp;
-       char *options;
-
-       options = malloc(BUFSIZ);
-       if (options == NULL) {
-               xlog(D_GENERAL, "%s: failed to allocate options buffer",
-                       __func__);
-               return NULL;
-       }
-       options[0] = '\0';
-
-       exp = do_locations_to_export(ops, locations, junction,
-                                               options, BUFSIZ);
-
-       free(options);
-       return exp;
-}
-

 /*
  * Retrieve locations information in "junction" and dump it to the
  * kernel.  Returns pointer to an exportent if "junction" refers
 /*
  * Retrieve locations information in "junction" and dump it to the
  * kernel.  Returns pointer to an exportent if "junction" refers