Imported Debian patch 1.0.7-6

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

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 0b34617dbb41261b2f5920c80df7858699942da0..14dac4185c32e9483f108a7faccdc9811ff0f3c1 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -36,6 +36,11 @@ static struct nfs_fh_len *get_rootfh(struct svc_req *, dirpath *, int *, int v3)
 
 int new_cache = 0;
 
+/* PRC: a high-availability callout program can be specified with -H
+ * When this is done, the program will receive callouts whenever clients
+ * send mount or unmount requests -- the callout is not needed for 2.6 kernel */
+char *ha_callout_prog = NULL;
+
 static struct option longopts[] =
 {
        { "foreground", 0, 0, 'F' },
@@ -48,6 +53,7 @@ static struct option longopts[] =
        { "version", 0, 0, 'v' },
        { "port", 1, 0, 'p' },
        { "no-tcp", 0, 0, 'n' },
+       { "ha-callout", 1, 0, 'H' },
        { NULL, 0, 0, 0 }
 };
 
@@ -444,7 +450,7 @@ main(int argc, char **argv)
 
        /* Parse the command line options and arguments. */
        opterr = 0;
-       while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
+       while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hH:N:V:v", longopts, NULL)) != EOF)
                switch (c) {
                case 'o':
                        descriptors = atoi(optarg);
@@ -463,6 +469,9 @@ main(int argc, char **argv)
                case 'f':
                        export_file = optarg;
                        break;
+               case 'H': /* PRC: specify a high-availability callout program */
+                       ha_callout_prog = optarg;
+                       break;
                case 'h':
                        usage(argv [0], 0);
                        break;
@@ -504,22 +513,26 @@ main(int argc, char **argv)
                exit(1);
        }
 
-       if (descriptors) {
-               if (getrlimit (RLIMIT_NOFILE, &rlim) != 0) {
-                       fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n",
-                               argv [0], strerror(errno));
-                       exit(1);
-               }
-
-               rlim.rlim_cur = descriptors;
-               if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
-                       fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",
+       if (getrlimit (RLIMIT_NOFILE, &rlim) != 0)
+               fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n",
                                argv [0], strerror(errno));
-                       exit(1);
+       else {
+               /* glibc sunrpc code dies if getdtablesize > FD_SETSIZE */
+               if ((descriptors == 0 && rlim.rlim_cur > FD_SETSIZE) ||
+                   descriptors > FD_SETSIZE)
+                       descriptors = FD_SETSIZE;
+               if (descriptors) {
+                       rlim.rlim_cur = descriptors;
+                       if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
+                               fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",
+                                       argv [0], strerror(errno));
+                               exit(1);
+                       }
                }
        }
        /* Initialize logging. */
-/*     xlog_open("mountd"); */
+       if (!foreground) xlog_stderr(0);
+       xlog_open("mountd");
 
        sa.sa_handler = SIG_IGN;
        sa.sa_flags = 0;
@@ -577,7 +590,6 @@ main(int argc, char **argv)
                        if (fd > 2) (void) close(fd);
                }
                setsid();
-               xlog_background();
        }
 
        my_svc_run();
@@ -593,6 +605,7 @@ usage(const char *prog, int n)
 "Usage: %s [-F|--foreground] [-h|--help] [-v|--version] [-d kind|--debug kind]\n"
 "      [-o num|--descriptors num] [-f exports-file|--exports-file=file]\n"
 "      [-p|--port port] [-V version|--nfs-version version]\n"
-"      [-N version|--no-nfs-version version] [-n|--no-tcp]\n", prog);
+"      [-N version|--no-nfs-version version] [-n|--no-tcp]\n"
+"      [-H ha-callout-prog]\n", prog);
        exit(n);
 }