mount.nfs: rename mount_errors()

The function mount_errors() actually reports RPC errors generated by the
user-land RPC library.  We're about to add a similar function for reporting
system call errors via errno, so rename mount_errors() to be more specific
about what it does.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/utils/mount/error.c b/utils/mount/error.c
index 1f60b79f2ebadb6a86ea29684240fcff7c57df93..3f7458c96ed0574ff3237ba0ac77a077642b3606 100644 (file)
--- a/utils/mount/error.c
+++ b/utils/mount/error.c
@@ -76,7 +76,16 @@ static int rpc_strerror(int spos)
        return pos;
 }
 
        return pos;
 }
 

-void mount_errors(char *server, int will_retry, int bg)
+/**
+ * rpc_mount_errors - log an RPC error that occurred during a user-space mount
+ * @server: C string containing name of server we are attempting to mount
+ * @will_retry: one indicates mount will retry at some later point
+ * @bg: one indicates this is a background mount
+ *
+ * Extracts the error code from the user-space RPC library, and reports it
+ * on stderr (fg mount) or in the system log (bg mount).
+ */
+void rpc_mount_errors(char *server, int will_retry, int bg)

 {
        int pos = 0;
        char *tmp;
 {
        int pos = 0;
        char *tmp;

diff --git a/utils/mount/error.h b/utils/mount/error.h
index 5e4b01b188d4e30f7b86c3ef4b644f7b83399c5b..ce9a7b651884f297a11da7e33015c5000ca75a47 100644 (file)
--- a/utils/mount/error.h
+++ b/utils/mount/error.h
@@ -24,5 +24,5 @@
 char *nfs_strerror(int);
 
 void mount_error(const char *, const char *, int);
 char *nfs_strerror(int);
 
 void mount_error(const char *, const char *, int);

-void mount_errors(char *, int, int);
+void rpc_mount_errors(char *, int, int);

 void umount_error(int, const char *);
 void umount_error(int, const char *);

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 4790c7998b11ff548fd4ef9d4dcbad639d7c664c..0a32c3c4f644444e135ebb2405b6130077960fc3 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -428,15 +428,15 @@ int nfs4mount(const char *spec, const char *node, int flags,
                        if (errno == ETIMEDOUT)
                                break;
                default:
                        if (errno == ETIMEDOUT)
                                break;
                default:

-                       mount_errors(hostname, 0, bg);
+                       rpc_mount_errors(hostname, 0, bg);

                        goto fail;
                }
                t = time(NULL);
                if (t >= timeout) {
                        goto fail;
                }
                t = time(NULL);
                if (t >= timeout) {

-                       mount_errors(hostname, 0, bg);
+                       rpc_mount_errors(hostname, 0, bg);

                        goto fail;
                }
                        goto fail;
                }

-               mount_errors(hostname, 1, bg);
+               rpc_mount_errors(hostname, 1, bg);

                continue;
        }
 
                continue;
        }
 

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 6c34a2b3aaf91ebd49a3a23c9e3f5e2e0d1b74d6..23dd2f607eafcbb739bc6d0e461dd28cb0666f79 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -688,15 +688,15 @@ nfsmount(const char *spec, const char *node, int flags,
                                if (errno == ETIMEDOUT)
                                        break;
                        default:
                                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) {
                        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;
                        }
                                goto fail;
                        }

-                       mount_errors(*nfs_server.hostname, 1, bg);
+                       rpc_mount_errors(*nfs_server.hostname, 1, bg);

                        continue;
                }
                if (!running_bg) {
                        continue;
                }
                if (!running_bg) {


@@ -707,11 +707,11 @@ nfsmount(const char *spec, const char *node, int flags,
                }
                t = time(NULL);
                if (t >= timeout) {
                }
                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)
                        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) {
        }
 
        if (nfs_pmap->pm_vers == 2) {