The mount(5) man page states that the noquota, quota, usrquota and

[nfs-utils.git] / utils / mount / nfsmount.c

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 7befbee2933c44724bf945181e3713db9a7c476e..3d2ebb1066137a2733fe4616c36d097b821e3092 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -488,14 +488,14 @@ out_bad:
 
 int
 nfsmount(const char *spec, const char *node, int flags,
-        char **extra_opts, int fake)
+        char **extra_opts, int fake, int running_bg)
 {
        static char *prev_bg_host;
        char hostdir[1024];
        char *hostname, *dirname, *old_opts, *mounthost = NULL;
        char new_opts[1024], cbuf[1024];
        static struct nfs_mount_data data;
-       int val, running_bg = 0;
+       int val;
        static int doonce = 0;
 
        clnt_addr_t mnt_server = { &mounthost, };
@@ -688,15 +688,15 @@ nfsmount(const char *spec, const char *node, int flags,
                                if (errno == ETIMEDOUT)
                                        break;
                        default:
-                               mount_errors(*nfs_server.hostname, 0, bg);
+                               rpc_mount_errors(*nfs_server.hostname, 0, bg);
                        goto fail;
                        }
                        t = time(NULL);
                        if (t >= timeout) {
-                               mount_errors(*nfs_server.hostname, 0, bg);
+                               rpc_mount_errors(*nfs_server.hostname, 0, bg);
                                goto fail;
                        }
-                       mount_errors(*nfs_server.hostname, 1, bg);
+                       rpc_mount_errors(*nfs_server.hostname, 1, bg);
                        continue;
                }
                if (!running_bg) {
@@ -707,11 +707,11 @@ nfsmount(const char *spec, const char *node, int flags,
                }
                t = time(NULL);
                if (t >= timeout) {
-                       mount_errors(*nfs_server.hostname, 0, bg);
+                       rpc_mount_errors(*nfs_server.hostname, 0, bg);
                        goto fail;
                }
                if (doonce++ < 1)
-                       mount_errors(*nfs_server.hostname, 1, bg);
+                       rpc_mount_errors(*nfs_server.hostname, 1, bg);
        }
 
        if (nfs_pmap->pm_vers == 2) {
@@ -848,7 +848,7 @@ noauth_flavors:
                if (!start_statd()) {
                        nfs_error(_("%s: rpc.statd is not running but is "
                                "required for remote locking.\n"
-                               "   Either use '-o nolocks' to keep "
+                               "   Either use '-o nolock' to keep "
                                "locks local, or start statd."),
                                        progname);
                        goto fail;
@@ -863,7 +863,7 @@ noauth_flavors:
                }
        }
 
-       return 0;
+       return EX_SUCCESS;
 
        /* abort */
  fail: