mount.nfs: Change *flags to flags

It's not necessary to treat the *flags parameter to nfsmount and nfs4mount
as an output parameter.  Nothing is passed back.  Replace it with a normal
call-by-value.

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 bd7e25ca218d0d0547135f51e7393cf2714ac2b3..2b211b9ee38eac8045da5530ed3dc41053735365 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, 0, fake);
        else
-               mnt_err = nfsmount(spec, mount_point, &flags, &extra_opts, 0, fake);
+               mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, 0, fake);
 
        if (mnt_err)
                exit(EX_FAIL);

diff --git a/utils/mount/nfs4_mount.h b/utils/mount/nfs4_mount.h
index 921739b4e90a4593903cf8c93091b054b42496e9..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
 
-int nfs4mount(const char *, const char *, int *, char **, int, int);
+int nfs4mount(const char *, const char *, int, char **, int, int);
 
 #endif

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index a0a1cabe40edaf34d5ab21e6a357a23e05863247..1cbeafaaddb8e693dffa055c416161cc2bf3a240 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -167,7 +167,7 @@ static int get_my_ipv4addr(char *ip_addr, int len)
        return 0;
 }
 
-int nfs4mount(const char *spec, const char *node, int *flags,
+int nfs4mount(const char *spec, const char *node, int flags,
              char **extra_opts, int running_bg, int fake)
 {
        static struct nfs4_mount_data data;
@@ -444,7 +444,7 @@ int nfs4mount(const char *spec, const char *node, int *flags,
 
        if (!fake) {
                if (mount(spec, node, "nfs4",
-                               *flags & ~(MS_USER|MS_USERS), &data)) {
+                               flags & ~(MS_USER|MS_USERS), &data)) {
                        mount_error(spec, node, errno);
                        goto fail;
                }

diff --git a/utils/mount/nfs_mount.h b/utils/mount/nfs_mount.h
index 169f12e5fbeb4fd0a8827881139d034d547cb674..8c46ce2c6dba569add557fbaf584fe239503f090 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, int);
 
 #endif /* _NFS_MOUNT_H */

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index b6a0d6041040f66b0cb7e0220ceddcec7d0654da..89fd4a32f05144530cee2146fef6c649fa3265fd 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -486,7 +486,7 @@ out_bad:
 }
 
 int
-nfsmount(const char *spec, const char *node, int *flags,
+nfsmount(const char *spec, const char *node, int flags,
         char **extra_opts, int running_bg, int fake)
 {
        static char *prev_bg_host;
@@ -618,7 +618,7 @@ nfsmount(const char *spec, const char *node, int *flags,
 
        data.version = nfs_mount_data_version;
 
-       if (*flags & MS_REMOUNT)
+       if (flags & MS_REMOUNT)
                goto out_ok;
 
        /*
@@ -862,7 +862,7 @@ noauth_flavors:
 
        if (!fake) {
                if (mount(spec, node, "nfs",
-                               *flags & ~(MS_USER|MS_USERS), &data)) {
+                               flags & ~(MS_USER|MS_USERS), &data)) {
                        mount_error(spec, node, errno);
                        goto fail;
                }