summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--utils/mount/mount.c4
-rw-r--r--utils/mount/nfs4_mount.h2
-rw-r--r--utils/mount/nfs4mount.c2
-rw-r--r--utils/mount/nfs_mount.h2
-rw-r--r--utils/mount/nfsmount.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 2b211b9..da5482b 100644
--- 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 b03792e..00581fd 100644
--- 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 1cbeafa..f98e275 100644
--- 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 8c46ce2..279ff36 100644
--- 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 89fd4a3..8845f8b 100644
--- 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, };