mount.nfs: restore bg argument to nfsmount() and nfs4mount()

To enable background mounting again, restore the "bg" argument to
nfsmount() and nfs4mount() that was recently removed.

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 a7ad035237b464fd269a2f0b1cf6fb3de968b797..9ac817cd42e04c565f618f3ea630ccceff04ddde 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -493,9 +493,11 @@ int main(int argc, char *argv[])
        }
 
        if (strcmp(fs_type, "nfs4") == 0)
        }
 
        if (strcmp(fs_type, "nfs4") == 0)

-               mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake);
+               mnt_err = nfs4mount(spec, mount_point, flags,
+                                       &extra_opts, fake, 0);

        else
        else

-               mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake);
+               mnt_err = nfsmount(spec, mount_point, flags,
+                                       &extra_opts, fake, 0);

 
        if (mnt_err)
                exit(EX_FAIL);
 
        if (mnt_err)
                exit(EX_FAIL);

diff --git a/utils/mount/nfs4_mount.h b/utils/mount/nfs4_mount.h
index 00581fdcfb1ee53131e9fd969ee14279e9d2d9a5..b03792ea1658e7a378117a1c337656caafe6b2c8 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
 
 #define NFS4_MOUNT_UNSHARED    0x8000  /* 5 */
 #define NFS4_MOUNT_FLAGMASK    0xFFFF
 

-int nfs4mount(const char *, const char *, int, char **, int);
+int nfs4mount(const char *, const char *, int, char **, int, int);

 
 #endif
 
 #endif

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 8f95ab735966ebe10b2d70cdde6af45a07ffefa4..c4e8bfb0a3ba7d1a04339604d8e6db55fbeb13a7 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -166,7 +166,7 @@ static int get_my_ipv4addr(char *ip_addr, int len)
 }
 
 int nfs4mount(const char *spec, const char *node, int flags,
 }
 
 int nfs4mount(const char *spec, const char *node, int flags,

-             char **extra_opts, int fake)
+             char **extra_opts, int fake, int running_bg)

 {
        static struct nfs4_mount_data data;
        static char hostdir[1024];
 {
        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 dcce3702995865d27abd04aa144f32c46ccc126f..7df8fb262f97f7925a4839bd99ce10f9226c7f89 100644 (file)
--- a/utils/mount/nfs_mount.h
+++ b/utils/mount/nfs_mount.h
@@ -80,7 +80,7 @@ struct nfs_mount_data {
 #define AUTH_GSS_SPKMP         390011
 #endif
 
 #define AUTH_GSS_SPKMP         390011
 #endif
 

-int    nfsmount(const char *, const char *, int , char **, int);
+int    nfsmount(const char *, const char *, int , char **, int, int);

 int    nfsumount(int, char **);
 
 #endif /* _NFS_MOUNT_H */
 int    nfsumount(int, char **);
 
 #endif /* _NFS_MOUNT_H */

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 7befbee2933c44724bf945181e3713db9a7c476e..583948208e0b43e741ec152dfadac84d04519cb8 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,
 
 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;
 {
        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, };
        static int doonce = 0;
 
        clnt_addr_t mnt_server = { &mounthost, };