Add support for -s/--state-directory-path for rpc.mountd and exportfs
Subsystems (2)
v2 cover Add support for -s/--state-directory-path for rpc.mountd and exportfs
Currently, rpc.mountd's -s/--state-directory-path option doesn't really do anything (rpc.mountd tests it via chdir() but that's all). These patches implement the -s/--state-directory-path option so that rpc.mountd's state files (the etab and rmtab) can be placed in a location other than /var/lib/nfs... for example, /run/nfs.
To use /run/nfs, it's necessary to create a systemd-tmpfiles config file, e.g.
# cat /usr/lib/tmpfiles.d/nfs.conf #Type Path Mode UID GID Age Argument d /run/nfs 0755 root root - - f /run/nfs/etab 0644 root root - - f /run/nfs/rmtab 0644 root root - -
and if selinux is in enforcing mode, the correct context would need to be set on the directory (On Fedora, semanage barks at me if I use /run/nfs... that's why I'm using /var/run/nfs here instead):
# semanage fcontext -a -t var_lib_nfs_t "/var/run/nfs(/.*)?"
Changes since v1:
- Replaced all newly-added occurrences of the term 'xtab' so it wouldn't be confused with the recently removed 'xtab' file. I did not replace any existing uses of the term 'xtab' though.
- Removed the reference to statd on the mountd man page.
Scott Mayhew (2):
libnsm.a: refactor nsm_setup_pathnames() and nsm_make_pathname() mountd/exportfs: implement the -s/--state-directory-path option
support/export/xtab.c | 82 +++++++++++++++++++++++++++++++++- support/include/misc.h | 3 ++ support/include/nfslib.h | 17 +++++++ support/misc/Makefile.am | 2 +- support/misc/file.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ support/nfs/cacheio.c | 4 +- support/nfs/rmtab.c | 4 +- support/nsm/file.c | 45 ++----------------- utils/exportfs/exportfs.c | 13 ++++++ utils/mountd/auth.c | 8 ++-- utils/mountd/mountd.c | 31 ++++++++----- utils/mountd/mountd.man | 2 +- utils/mountd/rmtab.c | 26 ++++++----- utils/statd/Makefile.am | 1 + 14 files changed, 274 insertions(+), 74 deletions(-) create mode 100644 support/misc/file.c
Signature · 1 line
2.7.4
PATCH v2 1/2 libnsm.a: refactor nsm_setup_pathnames() and nsm_make_pathname()
Move the logic in nsm_setup_pathnames() and nsm_make_pathname() to similar generic functions in libmisc.a so that the exportfs and rpc.mountd programs can make use of them later.
--- support/include/misc.h | 3 ++ support/misc/Makefile.am | 2 +- support/misc/file.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ support/nsm/file.c | 45 ++----------------- utils/statd/Makefile.am | 1 + 5 files changed, 118 insertions(+), 43 deletions(-) create mode 100644 support/misc/file.c
support/include/misc.h +3 -0
@@ -15,6 +15,9 @@int randomkey (unsigned char *keyout,int len);int weakrandomkey (unsigned char *keyout,int len); +char *generic_make_pathname (const char *,const char *); +_Bool generic_setup_basedir (const char *,const char *,char *); +extern int is_mountpoint (char *path);/* size of the file pointer buffers for rpc procfs files */
support/misc/Makefile.am +1 -1
@@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libmisc.a -libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c +libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c MAINTAINERCLEANFILES = Makefile.in
support/misc/file.c new file +110 -0
110 lines not on this page · raw message
support/nsm/file.c +3 -42
63 lines not on this page · raw message
utils/statd/Makefile.am +1 -0
@@ -18,6 +18,7 @@ statd_LDADD = ../../support/nsm/libnsm.a \ $(LIBWRAP) $(LIBNSL) $(LIBCAP) $(LIBTIRPC) sm_notify_LDADD = ../../support/nsm/libnsm.a \ ../../support/nfs/libnfs.a \ + ../../support/misc/libmisc.a \ $(LIBNSL) $(LIBCAP) $(LIBTIRPC) EXTRA_DIST = sim_sm_inter.x $(man8_MANS) simulate.c
Signature · 1 line
2.7.4
Re: [nfs-utils PATCH v2 1/2] libnsm.a: refactor nsm_setup_pathnames() and nsm_make_pathname()
Quoted 143 lines · Scott Mayhew
Move the logic in
nsm_setup_pathnames()andnsm_make_pathname()to similar generic functions in libmisc.a so that the exportfs and rpc.mountd programs can make use of them later.Signed-off-by Scott Mayhew <[email protected]>--- support/include/misc.h | 3 ++ support/misc/Makefile.am | 2 +- support/misc/file.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ support/nsm/file.c | 45 ++----------------- utils/statd/Makefile.am | 1 + 5 files changed, 118 insertions(+), 43 deletions(-) create mode 100644 support/misc/file.csupport/include/misc.h +3
-0@@ -15,6 +15,9 @@int randomkey (unsigned char *keyout,int len);int weakrandomkey (unsigned char *keyout,int len); +char *generic_make_pathname (const char *,const char *); +_Bool generic_setup_basedir (const char *,const char *,char *); +extern int is_mountpoint (char *path);/* size of the file pointer buffers for rpc procfs files */ support/misc/Makefile.am +1
-1@@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libmisc.a -libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c +libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c MAINTAINERCLEANFILES = Makefile.insupport/misc/file.c new file +97
-0@@ -0,0 +1,110 @@ +/* +* Copyright 2009 Oracle. All rights reserved. +* Copyright 2017 Red Hat, Inc. All rights reserved. +* +* This file is part of nfs-utils. +* +* nfs-utils is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* nfs-utils is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with nfs-utils. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <sys/stat.h> + +#include <string.h> +#include <libgen.h> +#include <stdio.h> +#include <errno.h> +#include <dirent.h> +#include <stdlib.h> +#include <stdbool.h> + +#include "xlog.h" +#include "misc.h" + +static _Bool +error_check (const int len,const size_t buflen) +{ +return (len <0 ) || ((size_t )len >= buflen); +} + +/* +* Returns a dynamically allocated, '\0'-terminated buffer +* containing an appropriate pathname, or NULL if an error +* occurs. Caller must free the returned result with free(3). +*/ +__attribute__((__malloc__)) +char * +generic_make_pathname (const char *base,const char *leaf) +{ +size_t size; +char *path; +int len; + + size =strlen (base) +strlen (leaf) +2 ; +if (size >PATH_MAX ) +return NULL ; + + path =malloc (size); +if (path ==NULL ) +return NULL ; + + len =snprintf (path, size,"%s/%s" , base, leaf); +if (error_check (len, size)) { +free (path); +return NULL ; + } + +return path; +} + + +/** +* generic_setup_basedir - set up basedir +* @progname: C string containing name of program, for error messages +* @parentdir: C string containing pathname to on-disk state, or NULL +* @base: C string used to contain the basedir that is set up +* +* This runs before logging is set up, so error messages are directed +* to stderr. +* +* Returns true and sets up our basedir, if @parentdir was valid +* and usable; otherwise false is returned. +*/ +_Bool +generic_setup_basedir (const char *progname,const char *parentdir,char *base) +{ +static char buf[PATH_MAX ]; +struct stat st; +char *path; + +/* First: test length of name and whether it exists */ +if (lstat (parentdir, &st) ==-1 ) { + (void )fprintf (stderr,"%s: Failed to stat %s: %s" , + progname, parentdir,strerror (errno)); +return false; + } + +/* Ensure we have a clean directory pathname */
support/misc/file.c line 107
Quoted 10 lines
support/misc/file.c new file +10
-0+strncpy (buf, parentdir,sizeof (buf)); + path =dirname (buf); +if (*path =='.' ) { + (void )fprintf (stderr,"%s: Unusable directory %s" , + progname, parentdir); +return false; + } + +xlog (D_CALL ,"Using %s as the state directory" , parentdir); +strncpy (base, parentdir,strlen (base));
This isn't good.
"base" is either nsm_base_dirname or state_base_dirname with are both PATH_MAX long char arrays which were initialised to
e.g. /var/lib/nfs.
So strlen(base) is about 12.
So as long as parentdir is shorter than NFS_STATEDIR or NSM_DEFAULT_STATEDIR this will work. If it is longer, it gets truncated.
I think this should be 'strncpy(base,parentdir,PATH_MAX)' or similar.
support/misc/file.c line 108
Quoted 1 line
support/misc/file.c new file +1
-0+ base[strlen (parentdir)] ='\0' ;
If parentdir is too long, this isn't safe, and if it is not too long, you can just use strcpy()...
Apart from that:
(I'd rather not have that error_check() function, it just obscures the
code I think. But as you obviously copied it from the original making minimal changes, it probably makes sense to leave it as it is)
Thanks,
NeilBrown
Quoted 91 lines
support/misc/file.c new file +2
-0+return true; +}support/nsm/file.c +3
-42@@ -88,6 +88,7 @@#include "xlog.h" #include "nsm.h" +#include "misc.h" #define RPCARGSLEN (4 * (8 + 1))#define LINELEN (RPCARGSLEN + SM_PRIV_SIZE * 2 + 1)@@ -170,25 +171,7 @@ __attribute__((__malloc__))static char *nsm_make_pathname (const char *directory) { -size_t size; -char *path; -int len; - - size =strlen (nsm_base_dirname) +strlen (directory) +2 ; -if (size >PATH_MAX ) -return NULL ; - - path =malloc (size); -if (path ==NULL ) -return NULL ; - - len =snprintf (path, size,"%s/%s" , nsm_base_dirname, directory); -if (error_check (len, size)) { -free (path); -return NULL ; - } - -return path; +return generic_make_pathname (nsm_base_dirname, directory); }/* @@ -293,29 +276,7 @@ out:_Bool nsm_setup_pathnames (const char *progname,const char *parentdir) { -static char buf[PATH_MAX ]; -struct stat st; -char *path; - -/* First: test length of name and whether it exists */ -if (lstat (parentdir, &st) ==-1 ) { - (void )fprintf (stderr,"%s: Failed to stat %s: %s" , - progname, parentdir,strerror (errno)); -return false; - } - -/* Ensure we have a clean directory pathname */ -strncpy (buf, parentdir,sizeof (buf)); - path =dirname (buf); -if (*path =='.' ) { - (void )fprintf (stderr,"%s: Unusable directory %s" , - progname, parentdir); -return false; - } - -xlog (D_CALL ,"Using %s as the state directory" , parentdir); -strncpy (nsm_base_dirname, parentdir,sizeof (nsm_base_dirname)); -return true; +return generic_setup_basedir (progname, parentdir, nsm_base_dirname); }/** utils/statd/Makefile.am +1
-0@@ -18,6 +18,7 @@ statd_LDADD = ../../support/nsm/libnsm.a \ $(LIBWRAP) $(LIBNSL) $(LIBCAP) $(LIBTIRPC) sm_notify_LDADD = ../../support/nsm/libnsm.a \ ../../support/nfs/libnfs.a \ + ../../support/misc/libmisc.a \ $(LIBNSL) $(LIBCAP) $(LIBTIRPC) EXTRA_DIST = sim_sm_inter.x $(man8_MANS) simulate.cSignature · 6 lines
2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/2 mountd/exportfs: implement the -s/--state-directory-path option
In reply to Scott Mayhew--- support/export/xtab.c | 82 +++++++++++++++++++++++++++++++++++++++++++++-- support/include/nfslib.h | 17 ++++++++++ support/nfs/cacheio.c | 4 ++- support/nfs/rmtab.c | 4 ++- utils/exportfs/exportfs.c | 13 ++++++++ utils/mountd/auth.c | 8 +++-- utils/mountd/mountd.c | 31 +++++++++++------- utils/mountd/mountd.man | 2 +- utils/mountd/rmtab.c | 26 ++++++++------- 9 files changed, 156 insertions(+), 31 deletions(-)
support/export/xtab.c +80 -2
@@ -14,12 +14,20 @@#include <unistd.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <libgen.h> #include "nfslib.h" #include "exportfs.h" #include "xio.h" #include "xlog.h" #include "v4root.h" +#include "misc.h" + +static char state_base_dirname[PATH_MAX ] =NFS_STATEDIR ; +extern struct state_paths etab;int v4root_needed;static void cond_rename (char *newfile,char *oldfile);
@@ -65,7 +73,7 @@ xtab_read(char *xtab, char *lockfn, int is_export)int xtab_export_read (void ) { -return xtab_read (_PATH_ETAB, _PATH_ETABLCK,1 ); +return xtab_read (etab.statefn, etab.lockfn,1 ); }/*
@@ -112,7 +120,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export)int xtab_export_write () { -return xtab_write (_PATH_ETAB, _PATH_ETABTMP, _PATH_ETABLCK,1 ); +return xtab_write (etab.statefn, etab.tmpfn, etab.lockfn,1 ); }/*
@@ -158,3 +166,73 @@ static void cond_rename(char *newfile, char *oldfile)rename (newfile, oldfile);return ; } + +/* +* Returns a dynamically allocated, '\0'-terminated buffer +* containing an appropriate pathname, or NULL if an error +* occurs. Caller must free the returned result with free(3). +*/ +static char * +state_make_pathname (const char *tabname) +{ +return generic_make_pathname (state_base_dirname, tabname); +} + +/** +* state_setup_basedir - set up basedir +* @progname: C string containing name of program, for error messages +* @parentdir: C string containing pathname to on-disk state, or NULL +* +* This runs before logging is set up, so error messages are directed +* to stderr. +* +* Returns true and sets up our basedir, if @parentdir was valid +* and usable; otherwise false is returned. +*/ +_Bool +state_setup_basedir (const char *progname,const char *parentdir) +{ +return generic_setup_basedir (progname, parentdir, state_base_dirname); +} + +int +setup_state_path_names (const char *progname,const char *statefn, +const char *tmpfn,const char *lockfn, +struct state_paths *paths) +{ + paths->statefn =state_make_pathname (statefn); +if (!paths->statefn) { +fprintf (stderr,"%s: state_make_pathname(%s) failed\n" , + progname, statefn); + goto out_err; + } + paths->tmpfn =state_make_pathname (tmpfn); +if (!paths->tmpfn) { +fprintf (stderr,"%s: state_make_pathname(%s) failed\n" , + progname, tmpfn); + goto out_free_statefn; + } + paths->lockfn =state_make_pathname (lockfn); +if (!paths->lockfn) { +fprintf (stderr,"%s: state_make_pathname(%s) failed\n" , + progname, lockfn); + goto out_free_tmpfn; + } +return 1 ; + +out_free_tmpfn: +free (paths->tmpfn); +out_free_statefn: +free (paths->statefn); +out_err: +return 0 ; + +} + +void +free_state_path_names (struct state_paths *paths) +{ +free (paths->statefn); +free (paths->tmpfn); +free (paths->lockfn); +}
support/include/nfslib.h +17 -0
@@ -58,6 +58,19 @@#define _PATH_PROC_EXPORTS_ALT "/proc/fs/nfsd/exports"#endif +#define ETAB "etab" +#define ETABTMP "etab.tmp" +#define ETABLCK ".etab.lock" +#define RMTAB "rmtab" +#define RMTABTMP "rmtab.tmp" +#define RMTABLCK ".rmtab.lock" + +struct state_paths { +char *statefn; +char *tmpfn; +char *lockfn; +}; +/* Maximum number of security flavors on an export: */ #define SECFLAVOR_COUNT 8
@@ -120,6 +133,10 @@ void fputrmtabent(FILE *fp, struct rmtabent *xep, long *pos);void fendrmtabent (FILE *fp);void frewindrmtabent (FILE *fp); +_Bool state_setup_basedir (const char *,const char *); +int setup_state_path_names (const char *,const char *,const char *,const char *,struct state_paths *); +void free_state_path_names (struct state_paths *); +/* mydaemon */ void daemon_init (bool fg);void daemon_ready (void );
support/nfs/cacheio.c +3 -1
@@ -27,6 +27,8 @@#include <time.h> #include <errno.h> +extern struct state_paths etab; +void qword_add (char **bpp,int *lp,char *str) {char *bp = *bpp;
@@ -228,7 +230,7 @@ cache_flush(int force) }; now =time (0 );if (force || -stat (_PATH_ETAB, &stb) !=0 || +stat (etab.statefn, &stb) !=0 || stb.st_mtime > now) stb.st_mtime =time (0 );
support/nfs/rmtab.c +3 -1
@@ -33,12 +33,14 @@static FILE *rmfp =NULL ; +extern struct state_paths rmtab; +int setrmtabent (char *type) {if (rmfp)fclose (rmfp); - rmfp =fsetrmtabent (_PATH_RMTAB, type); + rmfp =fsetrmtabent (rmtab.statefn, type);return (rmfp !=NULL ); }
utils/exportfs/exportfs.c +13 -0
@@ -52,6 +52,8 @@ static const char *lockfile = EXP_LOCKFILE;static int _lockfd =-1 ;char *conf_path =NFS_CONFFILE ; +struct state_paths etab; +/* * If we aren't careful, changes made by exportfs can be lost * when multiple exports process run at once:
@@ -95,6 +97,7 @@ main(int argc, char **argv)int f_ignore =0 ;int i, c;int force_flush =0 ; +char *s;if ((progname =strrchr (argv[0 ],'/' )) !=NULL ) progname++;
@@ -108,6 +111,11 @@ main(int argc, char **argv)conf_init ();xlog_from_conffile ("exportfs" ); +/* NOTE: following uses "mountd" section of nfs.conf !!!! */ + s =conf_get_str ("mountd" ,"state-directory-path" ); +if (s && !state_setup_basedir (argv[0 ], s)) +exit (1 ); +while ((c =getopt (argc, argv,"ad:fhio:ruvs" )) !=EOF ) {switch (c) {case 'a' :
@@ -159,13 +167,17 @@ main(int argc, char **argv)xlog (L_ERROR ,"-r and -u are incompatible" );return 1 ; } +if (!setup_state_path_names (progname,ETAB ,ETABTMP ,ETABLCK , &etab)) +return 1 ;if (optind == argc && ! f_all) {if (force_flush) {cache_flush (1 ); +free_state_path_names (&etab);return 0 ; }else {xtab_export_read ();dump (f_verbose, f_export_format); +free_state_path_names (&etab);return 0 ; } }
@@ -206,6 +218,7 @@ main(int argc, char **argv) }xtab_export_write ();cache_flush (force_flush); +free_state_path_names (&etab);return export_errno; }
utils/mountd/auth.c +5 -3
@@ -41,6 +41,8 @@ static nfs_client my_client;extern int use_ipaddr; +extern struct state_paths etab; +void auth_init (void ) {
@@ -84,10 +86,10 @@ auth_reload()static unsigned int counter;int fd; -if ((fd =open (_PATH_ETAB,O_RDONLY )) <0 ) { -xlog (L_FATAL ,"couldn't open %s" , _PATH_ETAB); +if ((fd =open (etab.statefn,O_RDONLY )) <0 ) { +xlog (L_FATAL ,"couldn't open %s" , etab.statefn); }else if (fstat (fd, &stb) <0 ) { -xlog (L_FATAL ,"couldn't stat %s" , _PATH_ETAB); +xlog (L_FATAL ,"couldn't stat %s" , etab.statefn);close (fd); }else if (last_fd !=-1 && stb.st_ino == last_inode) {/* We opened the etab file before, and its inode
utils/mountd/mountd.c +20 -11
@@ -29,6 +29,7 @@#include "mountd.h" #include "rpcmisc.h" #include "pseudoflavors.h" +#include "nfslib.h" extern void my_svc_run (void );
@@ -40,6 +41,9 @@ int reverse_resolve = 0;int manage_gids;int use_ipaddr =-1 ; +struct state_paths etab; +struct state_paths rmtab; +char *conf_path =NFS_CONFFILE ;/* PRC: a high-availability callout program can be specified with -H
@@ -110,8 +114,8 @@ unregister_services (void)static void cleanup_lockfiles (void ) { -unlink (_PATH_ETABLCK); -unlink (_PATH_RMTABLCK); +unlink (etab.lockfn); +unlink (rmtab.lockfn); }/* Wait for all worker child processes to exit and reap them */
@@ -181,6 +185,8 @@ fork_workers(void)wait_for_workers ();unregister_services ();cleanup_lockfiles (); +free_state_path_names (&etab); +free_state_path_names (&rmtab);xlog (L_NOTICE ,"mountd: no more workers, exiting\n" );exit (0 ); }
@@ -198,6 +204,8 @@ killer (int sig)wait_for_workers (); }cleanup_lockfiles (); +free_state_path_names (&etab); +free_state_path_names (&rmtab);xlog (L_NOTICE ,"Caught signal %d, un-registering and exiting." , sig);exit (0 ); }
@@ -656,7 +664,6 @@ get_exportlist(void)int main (int argc,char **argv) { -char *state_dir =NFS_STATEDIR ;char *progname;char *s;unsigned int listeners =0 ;
@@ -684,8 +691,8 @@ main(int argc, char **argv) ha_callout_prog =conf_get_str ("mountd" ,"ha-callout" ); s =conf_get_str ("mountd" ,"state-directory-path" ); -if (s) - state_dir = s; +if (s && !state_setup_basedir (argv[0 ], s)) +exit (1 );/* NOTE: following uses "nfsd" section of nfs.conf !!!! */ if (conf_get_bool ("nfsd" ,"udp" ,NFSCTL_UDPISSET (_rpcprotobits)))
@@ -758,7 +765,8 @@ main(int argc, char **argv) reverse_resolve =1 ;break ;case 's' : - state_dir =xstrdup (optarg); +if (!state_setup_basedir (argv[0 ], optarg)) +exit (1 );break ;case 't' : num_threads =atoi (optarg);
@@ -790,11 +798,10 @@ main(int argc, char **argv)fprintf (stderr,"%s: No protocol versions specified!\n" , progname);usage (progname,1 ); } -if (chdir (state_dir)) { -fprintf (stderr,"%s: chdir(%s) failed: %s\n" , - progname, state_dir,strerror (errno)); -exit (1 ); - } +if (!setup_state_path_names (progname,ETAB ,ETABTMP ,ETABLCK , &etab)) +return 1 ; +if (!setup_state_path_names (progname,RMTAB ,RMTABTMP ,RMTABLCK , &rmtab)) +return 1 ;if (getrlimit (RLIMIT_NOFILE , &rlim) !=0 ) fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n",
@@ -888,6 +895,8 @@ main(int argc, char **argv)xlog (L_ERROR ,"RPC service loop terminated unexpectedly. Exiting...\n" );unregister_services (); +free_state_path_names (&etab); +free_state_path_names (&rmtab);exit (1 ); }
utils/mountd/mountd.man +1 -1
@@ -144,7 +144,7 @@ Instead, mount the nfsd filesystem on .IR /proc/fs/nfsd . .TP .BI "\-s," "" " \-\-state\-directory\-path " directory -Specify a directory in which to place statd state information. +Specify a directory in which to place state information (etab and rmtab). If this option is not specified the default of .I /var/lib/nfs is used.
utils/mountd/rmtab.c +14 -12
@@ -28,6 +28,8 @@extern int reverse_resolve; +extern struct state_paths rmtab; +/* If new path is a link do not destroy it but place the * file where the link points. */
@@ -59,7 +61,7 @@ mountlist_add(char *host, const char *path)int lockid;long pos; -if ((lockid =xflock (_PATH_RMTABLCK,"a" )) <0 ) +if ((lockid =xflock (rmtab.lockfn,"a" )) <0 )return ;setrmtabent ("r+" );while ((rep =getrmtabent (1 , &pos)) !=NULL ) {
@@ -99,13 +101,13 @@ mountlist_del(char *hname, const char *path)int lockid;int match; -if ((lockid =xflock (_PATH_RMTABLCK,"w" )) <0 ) +if ((lockid =xflock (rmtab.lockfn,"w" )) <0 )return ;if (!setrmtabent ("r" )) {xfunlock (lockid);return ; } -if (!(fp =fsetrmtabent (_PATH_RMTABTMP,"w" ))) { +if (!(fp =fsetrmtabent (rmtab.tmpfn,"w" ))) {endrmtabent ();xfunlock (lockid);return ;
@@ -121,9 +123,9 @@ mountlist_del(char *hname, const char *path)if (!match || rep->r_count)fputrmtabent (fp, rep,NULL ); } -if (slink_safe_rename (_PATH_RMTABTMP, _PATH_RMTAB) <0 ) { +if (slink_safe_rename (rmtab.tmpfn, rmtab.statefn) <0 ) {xlog (L_ERROR ,"couldn't rename %s to %s" , - _PATH_RMTABTMP, _PATH_RMTAB); + rmtab.tmpfn, rmtab.statefn); }endrmtabent ();/* close & unlink */ fendrmtabent (fp);
@@ -138,7 +140,7 @@ mountlist_del_all(const struct sockaddr *sap)FILE *fp;int lockid; -if ((lockid =xflock (_PATH_RMTABLCK,"w" )) <0 ) +if ((lockid =xflock (rmtab.lockfn,"w" )) <0 )return ; hostname =host_canonname (sap);if (hostname ==NULL ) {
@@ -151,7 +153,7 @@ mountlist_del_all(const struct sockaddr *sap)if (!setrmtabent ("r" )) goto out_free; -if (!(fp =fsetrmtabent (_PATH_RMTABTMP,"w" ))) +if (!(fp =fsetrmtabent (rmtab.tmpfn,"w" ))) goto out_close;while ((rep =getrmtabent (1 ,NULL )) !=NULL ) {
@@ -160,9 +162,9 @@ mountlist_del_all(const struct sockaddr *sap)continue ;fputrmtabent (fp, rep,NULL ); } -if (slink_safe_rename (_PATH_RMTABTMP, _PATH_RMTAB) <0 ) { +if (slink_safe_rename (rmtab.tmpfn, rmtab.statefn) <0 ) {xlog (L_ERROR ,"couldn't rename %s to %s" , - _PATH_RMTABTMP, _PATH_RMTAB); + rmtab.tmpfn, rmtab.statefn); }fendrmtabent (fp); out_close:
@@ -195,11 +197,11 @@ mountlist_list(void)struct stat stb;int lockid; -if ((lockid =xflock (_PATH_RMTABLCK,"r" )) <0 ) +if ((lockid =xflock (rmtab.lockfn,"r" )) <0 )return NULL ; -if (stat (_PATH_RMTAB, &stb) <0 ) { +if (stat (rmtab.statefn, &stb) <0 ) {xlog (L_ERROR ,"can't stat %s: %s" , - _PATH_RMTAB,strerror (errno)); + rmtab.statefn,strerror (errno));xfunlock (lockid);return NULL ; }
Signature · 1 line
2.7.4
Re: [nfs-utils PATCH v2 2/2] mountd/exportfs: implement the -s/--state-directory-path option
Quoted 135 lines · Scott Mayhew
Signed-off-by Scott Mayhew <[email protected]>--- support/export/xtab.c | 82 +++++++++++++++++++++++++++++++++++++++++++++-- support/include/nfslib.h | 17 ++++++++++ support/nfs/cacheio.c | 4 ++- support/nfs/rmtab.c | 4 ++- utils/exportfs/exportfs.c | 13 ++++++++ utils/mountd/auth.c | 8 +++-- utils/mountd/mountd.c | 31 +++++++++++------- utils/mountd/mountd.man | 2 +- utils/mountd/rmtab.c | 26 ++++++++------- 9 files changed, 156 insertions(+), 31 deletions(-)support/export/xtab.c +80
-2@@ -14,12 +14,20 @@#include <unistd.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <libgen.h> #include "nfslib.h" #include "exportfs.h" #include "xio.h" #include "xlog.h" #include "v4root.h" +#include "misc.h" + +static char state_base_dirname[PATH_MAX ] =NFS_STATEDIR ; +extern struct state_paths etab;int v4root_needed;static void cond_rename (char *newfile,char *oldfile);@@ -65,7 +73,7 @@ xtab_read(char *xtab, char *lockfn, int is_export)int xtab_export_read (void ) { -return xtab_read (_PATH_ETAB, _PATH_ETABLCK,1 ); +return xtab_read (etab.statefn, etab.lockfn,1 ); }/* @@ -112,7 +120,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export)int xtab_export_write () { -return xtab_write (_PATH_ETAB, _PATH_ETABTMP, _PATH_ETABLCK,1 ); +return xtab_write (etab.statefn, etab.tmpfn, etab.lockfn,1 ); }/* @@ -158,3 +166,73 @@ static void cond_rename(char *newfile, char *oldfile)rename (newfile, oldfile);return ; } + +/* +* Returns a dynamically allocated, '\0'-terminated buffer +* containing an appropriate pathname, or NULL if an error +* occurs. Caller must free the returned result with free(3). +*/ +static char * +state_make_pathname (const char *tabname) +{ +return generic_make_pathname (state_base_dirname, tabname); +} + +/** +* state_setup_basedir - set up basedir +* @progname: C string containing name of program, for error messages +* @parentdir: C string containing pathname to on-disk state, or NULL +* +* This runs before logging is set up, so error messages are directed +* to stderr. +* +* Returns true and sets up our basedir, if @parentdir was valid +* and usable; otherwise false is returned. +*/ +_Bool +state_setup_basedir (const char *progname,const char *parentdir) +{ +return generic_setup_basedir (progname, parentdir, state_base_dirname); +} + +int +setup_state_path_names (const char *progname,const char *statefn, +const char *tmpfn,const char *lockfn, +struct state_paths *paths) +{ + paths->statefn =state_make_pathname (statefn); +if (!paths->statefn) { +fprintf (stderr,"%s: state_make_pathname(%s) failed\n" , + progname, statefn); + goto out_err; + } + paths->tmpfn =state_make_pathname (tmpfn); +if (!paths->tmpfn) { +fprintf (stderr,"%s: state_make_pathname(%s) failed\n" , + progname, tmpfn); + goto out_free_statefn; + } + paths->lockfn =state_make_pathname (lockfn); +if (!paths->lockfn) { +fprintf (stderr,"%s: state_make_pathname(%s) failed\n" , + progname, lockfn); + goto out_free_tmpfn; + } +return 1 ; + +out_free_tmpfn: +free (paths->tmpfn); +out_free_statefn: +free (paths->statefn); +out_err: +return 0 ; + +} + +void +free_state_path_names (struct state_paths *paths) +{ +free (paths->statefn); +free (paths->tmpfn); +free (paths->lockfn); +}support/include/nfslib.h +0
-0
support/include/nfslib.h line 66
Quoted 9 lines
support/include/nfslib.h +6
-0@@ -58,6 +58,19 @@#define _PATH_PROC_EXPORTS_ALT "/proc/fs/nfsd/exports"#endif +#define ETAB "etab" +#define ETABTMP "etab.tmp" +#define ETABLCK ".etab.lock" +#define RMTAB "rmtab" +#define RMTABTMP "rmtab.tmp" +#define RMTABLCK ".rmtab.lock"
I would be happier if you completed removed _PATH_ETAB* and _PATH_RMTAB* as well. I don't think they are used any more, but they are still defined (and mentioned in at least one comment).
Quoted 85 lines
support/include/nfslib.h +11
-0+ +struct state_paths { +char *statefn; +char *tmpfn; +char *lockfn; +}; +/* Maximum number of security flavors on an export: */ #define SECFLAVOR_COUNT 8@@ -120,6 +133,10 @@ void fputrmtabent(FILE *fp, struct rmtabent *xep, long *pos);void fendrmtabent (FILE *fp);void frewindrmtabent (FILE *fp); +_Bool state_setup_basedir (const char *,const char *); +int setup_state_path_names (const char *,const char *,const char *,const char *,struct state_paths *); +void free_state_path_names (struct state_paths *); +/* mydaemon */ void daemon_init (bool fg);void daemon_ready (void );support/nfs/cacheio.c +3
-1@@ -27,6 +27,8 @@#include <time.h> #include <errno.h> +extern struct state_paths etab; +void qword_add (char **bpp,int *lp,char *str) {char *bp = *bpp;@@ -228,7 +230,7 @@ cache_flush(int force) }; now =time (0 );if (force || -stat (_PATH_ETAB, &stb) !=0 || +stat (etab.statefn, &stb) !=0 || stb.st_mtime > now) stb.st_mtime =time (0 );support/nfs/rmtab.c +3
-1@@ -33,12 +33,14 @@static FILE *rmfp =NULL ; +extern struct state_paths rmtab; +int setrmtabent (char *type) {if (rmfp)fclose (rmfp); - rmfp =fsetrmtabent (_PATH_RMTAB, type); + rmfp =fsetrmtabent (rmtab.statefn, type);return (rmfp !=NULL ); }utils/exportfs/exportfs.c +3
-0@@ -52,6 +52,8 @@ static const char *lockfile = EXP_LOCKFILE;static int _lockfd =-1 ;char *conf_path =NFS_CONFFILE ; +struct state_paths etab; +/* * If we aren't careful, changes made by exportfs can be lost * when multiple exports process run at once: @@ -95,6 +97,7 @@ main(int argc, char **argv)int f_ignore =0 ;int i, c;int force_flush =0 ; +char *s;if ((progname =strrchr (argv[0 ],'/' )) !=NULL ) progname++;
utils/exportfs/exportfs.c main(int argc, char **argv) · line 118
Quoted 8 lines
utils/exportfs/exportfs.c +5
-0@@ -108,6 +111,11 @@ main(int argc, char **argv)conf_init ();xlog_from_conffile ("exportfs" ); +/* NOTE: following uses "mountd" section of nfs.conf !!!! */ + s =conf_get_str ("mountd" ,"state-directory-path" ); +if (s && !state_setup_basedir (argv[0 ], s)) +exit (1 ); +
Could you add to the systemd/nfs.conf.man man page, in the
.TP
.B mountd
Recognized values:
section, that "state-directory-path" is also used by exportfs (much like the 'nfsd' section mentions that some values are also used by rpc.mountd).
Also the exportfs.man page should get a small ".SH CONFIGURATION FILE" section.
With those issues resolved,
Thanks,
NeilBrown