[PATCH 12/17] mount.nfs: Change *flags to flags

[PATCH 12/17] mount.nfs: Change *flags to flags

[Chuck Lever]

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>
---

 utils/mount/mount.c      |    4 ++--
 utils/mount/nfs4_mount.h |    2 +-
 utils/mount/nfs4mount.c  |    4 ++--
 utils/mount/nfs_mount.h  |    2 +-
 utils/mount/nfsmount.c   |    6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index bc2e53a..3f869ee 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -467,9 +467,9 @@ int main(int argc, char *argv[])
 		exit(EX_FAIL);
 
 	if (!strcmp(fs_type, "nfs4"))
-		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 921739b..b03792e 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, int);
 
 #endif
diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index c8fa0de..2c85db9 100644
--- 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 169f12e..8c46ce2 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, int);
 
 #endif /* _NFS_MOUNT_H */
diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 4ce8a4e..74b5f93 100644
--- 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;
 		}


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

Re: [PATCH 12/17] mount.nfs: Change *flags to flags

[Neil Brown]

On Sunday July 15, chuck.lever@oracle.com wrote:
> 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.

And, in fact, very little is passed forward.
nfs4mount doesn't use 'flags' at all... maybe it should?
nfsmount uses it for one thing - checking in MS_REMOUNT was set.
So maybe we should change the name to 'remount' and pass down
'flags & MS_REMOUNT' ??

Most of the stuff the nfsmount doesn't do if MS_REMOUNT is talking to
mountd which obviously is not relevant for NFSv4.  But NFSv4 still
tries to ping the server... Should that be excluded in MS_REMOUNT is
set, do you think?

NeilBrown

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs

Re: [PATCH 12/17] mount.nfs: Change *flags to flags

[Chuck Lever]

[-- Attachment #1: Type: text/plain, Size: 1013 bytes --]

Neil Brown wrote:
> On Sunday July 15, chuck.lever@oracle.com wrote:
>> 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.
> 
> And, in fact, very little is passed forward.
> nfs4mount doesn't use 'flags' at all... maybe it should?
> nfsmount uses it for one thing - checking in MS_REMOUNT was set.
> So maybe we should change the name to 'remount' and pass down
> 'flags & MS_REMOUNT' ??

The earlier patch to move the mount system call into nfsmount.c will 
need the
whole set of flags.  Likewise for nfs4mount.c.

Note this is also why MS_USER and MS_USERS need to be moved into 
mount_constants.h !  ;-)

> Most of the stuff the nfsmount doesn't do if MS_REMOUNT is talking to
> mountd which obviously is not relevant for NFSv4.  But NFSv4 still
> tries to ping the server... Should that be excluded in MS_REMOUNT is
> set, do you think?

I can take a look at that as a separate clean up.

[-- Attachment #2: chuck.lever.vcf --]
[-- Type: text/x-vcard, Size: 290 bytes --]

begin:vcard
fn:Chuck Lever
n:Lever;Chuck
org:Oracle Corporation;Corporate Architecture: Linux Projects Group
adr:;;1015 Granger Avenue;Ann Arbor;MI;48104;USA
title:Principal Member of Staff
tel;work:+1 248 614 5091
x-mozilla-html:FALSE
url:http://oss.oracle.com/~cel
version:2.1
end:vcard


[-- Attachment #3: Type: text/plain, Size: 286 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

[-- Attachment #4: Type: text/plain, Size: 140 bytes --]

_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs