Merge branch 'sid'

[nfs-utils.git] / utils / exportfs / exportfs.c

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 7432a6592c8d0e69c60dfc69ececec56e92b1f34..9f7954130ee2adf9579f933ec44134d25ed141da 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -16,6 +16,7 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/stat.h>
+#include <sys/file.h>
 #include <unistd.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -39,10 +40,45 @@ static void unexportfs(char *arg, int verbose);
 static void    exports_update(int verbose);
 static void    dump(int verbose);
 static void    error(nfs_export *exp, int err);
-static void    usage(const char *progname);
+static void    usage(const char *progname, int n);
 static void    validate_export(nfs_export *exp);
 static int     matchhostname(const char *hostname1, const char *hostname2);
 static void    export_d_read(const char *dname);
+static void grab_lockfile(void);
+static void release_lockfile(void);
+
+static const char *lockfile = EXP_LOCKFILE;
+static int _lockfd = -1;
+
+/*
+ * If we aren't careful, changes made by exportfs can be lost
+ * when multiple exports process run at once:
+ *
+ *     exportfs process 1      exportfs process 2
+ *     ------------------------------------------
+ *     reads etab version A    reads etab version A
+ *     adds new export B       adds new export C
+ *     writes A+B              writes A+C
+ *
+ * The locking in support/export/xtab.c will prevent mountd from
+ * seeing a partially written version of etab, and will prevent 
+ * the two writers above from writing simultaneously and
+ * corrupting etab, but to prevent problems like the above we
+ * need these additional lockfile() routines.
+ */
+static void 
+grab_lockfile()
+{
+       _lockfd = open(lockfile, O_CREAT|O_RDWR, 0666);
+       if (_lockfd != -1) 
+               lockf(_lockfd, F_LOCK, 0);
+}
+static void 
+release_lockfile()
+{
+       if (_lockfd != -1)
+               lockf(_lockfd, F_ULOCK, 0);
+}
 
 int
 main(int argc, char **argv)
@@ -69,11 +105,17 @@ main(int argc, char **argv)
 
        export_errno = 0;
 
-       while ((c = getopt(argc, argv, "aio:ruvf")) != EOF) {
+       while ((c = getopt(argc, argv, "afhio:ruv")) != EOF) {
                switch(c) {
                case 'a':
                        f_all = 1;
                        break;
+               case 'f':
+                       force_flush = 1;
+                       break;
+               case 'h':
+                       usage(progname, 0);
+                       break;
                case 'i':
                        f_ignore = 1;
                        break;
@@ -90,11 +132,8 @@ main(int argc, char **argv)
                case 'v':
                        f_verbose = 1;
                        break;
-               case 'f':
-                       force_flush = 1;
-                       break;
                default:
-                       usage(progname);
+                       usage(progname, 1);
                        break;
                }
        }
@@ -129,6 +168,13 @@ main(int argc, char **argv)
                        return 0;
                }
        }
+
+       /*
+        * Serialize things as best we can
+        */
+       grab_lockfile();
+       atexit(release_lockfile);
+
        if (f_export && ! f_ignore) {
                export_read(_PATH_EXPORTS);
                export_d_read(_PATH_EXPORTS_D);
@@ -680,8 +726,8 @@ error(nfs_export *exp, int err)
 }
 
 static void
-usage(const char *progname)
+usage(const char *progname, int n)
 {
-       fprintf(stderr, "usage: %s [-aruv] [host:/path]\n", progname);
-       exit(1);
+       fprintf(stderr, "usage: %s [-afhioruv] [host:/path]\n", progname);
+       exit(n);
 }