mountd: Check for return of stat function
Subsystems (2)
PATCH v2 1/2 mountd: Check for return of stat function
simplify the check, stat() return 0 on success -1 on failure
Fixes clang reported errors e.g.
| v4clients.c:29:6: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
| if (!stat("/proc/fs/nfsd/clients", &sb) == 0 ||
| ^ ~~---
v2: rebased
support/export/v4clients.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
support/export/v4clients.c +1 -1
@@ -26,7 +26,7 @@ void v4clients_init(void) {struct stat sb; -if (!stat ("/proc/fs/nfsd/clients" , &sb) ==0 || +if (stat ("/proc/fs/nfsd/clients" , &sb) !=0 || !S_ISDIR (sb.st_mode))return ;if (clients_fd >=0 )
Signature · 1 line
2.37.2
PATCH v2 2/2 Fix function prototypes
Clang is now erroring out on functions with out parameter types
Fixes errors like
error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
---
v2: Add Steve to Cc list
support/export/auth.c | 2 +- support/export/v4root.c | 2 +- support/export/xtab.c | 2 +- utils/exportfs/exportfs.c | 4 ++-- utils/mount/network.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
support/export/auth.c +1 -1
@@ -82,7 +82,7 @@ check_useipaddr(void) }unsigned int -auth_reload () +auth_reload (void ) {struct stat stb;static ino_t last_inode;
support/export/v4root.c +1 -1
@@ -198,7 +198,7 @@ static int v4root_add_parents(nfs_export *exp)* looking for components of the v4 mount. */ void -v4root_set () +v4root_set (void ) {nfs_export *exp;int i;
support/export/xtab.c +1 -1
@@ -135,7 +135,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export) }int -xtab_export_write () +xtab_export_write (void ) {return xtab_write (etab.statefn, etab.tmpfn, etab.lockfn,1 ); }
utils/exportfs/exportfs.c +2 -2
@@ -69,14 +69,14 @@ static int _lockfd = -1;* need these additional lockfile() routines. */ static void -grab_lockfile () +grab_lockfile (void ) { _lockfd =open (lockfile,O_CREAT |O_RDWR ,0666 );if (_lockfd !=-1 )lockf (_lockfd,F_LOCK ,0 ); }static void -release_lockfile () +release_lockfile (void ) {if (_lockfd !=-1 ) {lockf (_lockfd,F_ULOCK ,0 );
utils/mount/network.c +1 -1
@@ -179,7 +179,7 @@ static const unsigned long probe_mnt3_only[] = {static const unsigned int *nfs_default_proto (void );#ifdef MOUNT_CONFIG -static const unsigned int *nfs_default_proto () +static const unsigned int *nfs_default_proto (void ) {extern unsigned long config_default_proto;/*
Signature · 1 line
2.37.2
Re: [PATCH v2 2/2] Fix function prototypes
Quoted 6 lines · Khem Raj
Clang is now erroring out on functions with out parameter types
Fixes errors like
error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]Signed-off-by Khem Raj <[email protected]>
Committed... (tag: nfs-utils-2-6-3-rc1)
steved.
Quoted 84 lines
Cc Steve Dickson <[email protected]>---
v2: Add Steve to Cc listsupport/export/auth.c | 2 +- support/export/v4root.c | 2 +- support/export/xtab.c | 2 +- utils/exportfs/exportfs.c | 4 ++-- utils/mount/network.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)support/export/auth.c +1
-1@@ -82,7 +82,7 @@ check_useipaddr(void) }unsigned int -auth_reload () +auth_reload (void ) {struct stat stb;static ino_t last_inode;support/export/v4root.c +1
-1@@ -198,7 +198,7 @@ static int v4root_add_parents(nfs_export *exp)* looking for components of the v4 mount. */ void -v4root_set () +v4root_set (void ) {nfs_export *exp;int i;support/export/xtab.c +1
-1@@ -135,7 +135,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export) }int -xtab_export_write () +xtab_export_write (void ) {return xtab_write (etab.statefn, etab.tmpfn, etab.lockfn,1 ); }utils/exportfs/exportfs.c +2
-2@@ -69,14 +69,14 @@ static int _lockfd = -1;* need these additional lockfile() routines. */ static void -grab_lockfile () +grab_lockfile (void ) { _lockfd =open (lockfile,O_CREAT |O_RDWR ,0666 );if (_lockfd !=-1 )lockf (_lockfd,F_LOCK ,0 ); }static void -release_lockfile () +release_lockfile (void ) {if (_lockfd !=-1 ) {lockf (_lockfd,F_ULOCK ,0 );utils/mount/network.c +1
-1@@ -179,7 +179,7 @@ static const unsigned long probe_mnt3_only[] = {static const unsigned int *nfs_default_proto (void );#ifdef MOUNT_CONFIG -static const unsigned int *nfs_default_proto () +static const unsigned int *nfs_default_proto (void ) {extern unsigned long config_default_proto;/*
Quoted 9 lines · Khem Raj
simplify the check,
stat()return 0 on success -1 on failureFixes clang reported errors e.g.
| v4clients.c:29:6: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses] | if (!stat("/proc/fs/nfsd/clients", &sb) == 0 || | ^ ~~Signed-off-by Khem Raj <[email protected]>
Committed... (tag: nfs-utils-2-6-3-rc1)
steved
Quoted 21 lines
Cc Konstantin Khorenko <[email protected]>Cc Steve Dickson <[email protected]>---
v2: rebasedsupport/export/v4clients.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)support/export/v4clients.c +1
-1@@ -26,7 +26,7 @@ void v4clients_init(void) {struct stat sb; -if (!stat ("/proc/fs/nfsd/clients" , &sb) ==0 || +if (stat ("/proc/fs/nfsd/clients" , &sb) !=0 || !S_ISDIR (sb.st_mode))return ;if (clients_fd >=0 )
Quoted 10 lines · Khem Raj
simplify the check,
stat()return 0 on success -1 on failureFixes clang reported errors e.g.
| v4clients.c:29:6: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses] | if (!stat("/proc/fs/nfsd/clients", &sb) == 0 || | ^ ~~Signed-off-by Khem Raj <[email protected]>Cc Konstantin Khorenko <[email protected]>
Committed... (tag: nfs-utils-2-6-3-rc1)
steved
Quoted 20 lines
Cc Steve Dickson <[email protected]>---
v2: rebasedsupport/export/v4clients.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)support/export/v4clients.c +1
-1@@ -26,7 +26,7 @@ void v4clients_init(void) {struct stat sb; -if (!stat ("/proc/fs/nfsd/clients" , &sb) ==0 || +if (stat ("/proc/fs/nfsd/clients" , &sb) !=0 || !S_ISDIR (sb.st_mode))return ;if (clients_fd >=0 )