Remove the running_bg parameter

Clean up: when nfsmount and nfs4mount are called, running_bg is always set
to zero.  Remove the parameter from the call.

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 2b211b9ee38eac8045da5530ed3dc41053735365..da5482bbfb83bd151d886fdace4e962794faaf14 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -468,9 +468,9 @@ int main(int argc, char *argv[])
                exit(EX_FAIL);
 
        if (strcmp(fs_type, "nfs4") == 0)
-               mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, 0, fake);
+               mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake);
        else
-               mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, 0, fake);
+               mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake);
 
        if (mnt_err)
                exit(EX_FAIL);

diff --git a/utils/mount/nfs4_mount.h b/utils/mount/nfs4_mount.h
index b03792ea1658e7a378117a1c337656caafe6b2c8..00581fdcfb1ee53131e9fd969ee14279e9d2d9a5 100644 (file)
--- a/utils/mount/nfs4_mount.h
+++ b/utils/mount/nfs4_mount.h
@@ -68,6 +68,6 @@ struct nfs4_mount_data {
 #define NFS4_MOUNT_UNSHARED    0x8000  /* 5 */
 #define NFS4_MOUNT_FLAGMASK    0xFFFF
 
-int nfs4mount(const char *, const char *, int, char **, int, int);
+int nfs4mount(const char *, const char *, int, char **, int);
 
 #endif

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 1cbeafaaddb8e693dffa055c416161cc2bf3a240..f98e275252534e95fc5e0432b93a116592ac2774 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -168,7 +168,7 @@ static int get_my_ipv4addr(char *ip_addr, int len)
 }
 
 int nfs4mount(const char *spec, const char *node, int flags,
-             char **extra_opts, int running_bg, int fake)
+             char **extra_opts, int fake)
 {
        static struct nfs4_mount_data data;
        static char hostdir[1024];

diff --git a/utils/mount/nfs_mount.h b/utils/mount/nfs_mount.h
index 8c46ce2c6dba569add557fbaf584fe239503f090..279ff3691f1dec8075f656952d00d307d39720b9 100644 (file)
--- a/utils/mount/nfs_mount.h
+++ b/utils/mount/nfs_mount.h
@@ -80,6 +80,6 @@ struct nfs_mount_data {
 #define AUTH_GSS_SPKMP         390011
 #endif
 
-int nfsmount(const char *, const char *, int , char **, int, int);
+int nfsmount(const char *, const char *, int , char **, int);
 
 #endif /* _NFS_MOUNT_H */

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 89fd4a32f05144530cee2146fef6c649fa3265fd..8845f8b491d75ef95c602bb57be0084a7f443e4d 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -487,14 +487,14 @@ out_bad:
 
 int
 nfsmount(const char *spec, const char *node, int flags,
-        char **extra_opts, int running_bg, int fake)
+        char **extra_opts, int fake)
 {
        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;
+       int val, running_bg = 0;
        static int doonce = 0;
 
        clnt_addr_t mnt_server = { &mounthost, };