* [PATCH v2 1/2] mountd: Check for return of stat function
@ 2022-08-16 2:44 Khem Raj
2022-08-16 2:44 ` [PATCH v2 2/2] Fix function prototypes Khem Raj
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Khem Raj @ 2022-08-16 2:44 UTC (permalink / raw)
To: Steve Dickson; +Cc: Linux NFS Mailing list, Khem Raj, Konstantin Khorenko
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 ||
| ^ ~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Konstantin Khorenko <khorenko@virtuozzo.com>
Cc: Steve Dickson <steved@redhat.com>
---
v2: rebased
support/export/v4clients.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/export/v4clients.c b/support/export/v4clients.c
index 5f15b61..3230251 100644
--- a/support/export/v4clients.c
+++ b/support/export/v4clients.c
@@ -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)
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] Fix function prototypes
2022-08-16 2:44 [PATCH v2 1/2] mountd: Check for return of stat function Khem Raj
@ 2022-08-16 2:44 ` Khem Raj
2022-09-13 17:37 ` Steve Dickson
2022-09-13 17:37 ` [PATCH v2 1/2] mountd: Check for return of stat function Steve Dickson
2022-09-13 17:38 ` Steve Dickson
2 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2022-08-16 2:44 UTC (permalink / raw)
To: Steve Dickson; +Cc: Linux NFS Mailing list, 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 <raj.khem@gmail.com>
Cc: Steve Dickson <steved@redhat.com>
---
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(-)
diff --git a/support/export/auth.c b/support/export/auth.c
index 03ce4b8..2d7960f 100644
--- a/support/export/auth.c
+++ b/support/export/auth.c
@@ -82,7 +82,7 @@ check_useipaddr(void)
}
unsigned int
-auth_reload()
+auth_reload(void)
{
struct stat stb;
static ino_t last_inode;
diff --git a/support/export/v4root.c b/support/export/v4root.c
index c12a7d8..fbb0ad5 100644
--- a/support/export/v4root.c
+++ b/support/export/v4root.c
@@ -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;
diff --git a/support/export/xtab.c b/support/export/xtab.c
index c888a80..e210ca9 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -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);
}
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 6ba615d..0897b22 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -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);
diff --git a/utils/mount/network.c b/utils/mount/network.c
index ed2f825..01ead49 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -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;
/*
--
2.37.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] mountd: Check for return of stat function
2022-08-16 2:44 [PATCH v2 1/2] mountd: Check for return of stat function Khem Raj
2022-08-16 2:44 ` [PATCH v2 2/2] Fix function prototypes Khem Raj
@ 2022-09-13 17:37 ` Steve Dickson
2022-09-13 17:38 ` Steve Dickson
2 siblings, 0 replies; 5+ messages in thread
From: Steve Dickson @ 2022-09-13 17:37 UTC (permalink / raw)
To: Khem Raj; +Cc: Linux NFS Mailing list, Konstantin Khorenko
On 8/15/22 10:44 PM, Khem Raj wrote:
> 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 ||
> | ^ ~~
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Committed... (tag: nfs-utils-2-6-3-rc1)
steved
> Cc: Konstantin Khorenko <khorenko@virtuozzo.com>
> Cc: Steve Dickson <steved@redhat.com>
> ---
> v2: rebased
>
> support/export/v4clients.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/support/export/v4clients.c b/support/export/v4clients.c
> index 5f15b61..3230251 100644
> --- a/support/export/v4clients.c
> +++ b/support/export/v4clients.c
> @@ -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)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] Fix function prototypes
2022-08-16 2:44 ` [PATCH v2 2/2] Fix function prototypes Khem Raj
@ 2022-09-13 17:37 ` Steve Dickson
0 siblings, 0 replies; 5+ messages in thread
From: Steve Dickson @ 2022-09-13 17:37 UTC (permalink / raw)
To: Khem Raj; +Cc: Linux NFS Mailing list
On 8/15/22 10:44 PM, Khem Raj wrote:
> 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 <raj.khem@gmail.com>
Committed... (tag: nfs-utils-2-6-3-rc1)
steved.
> Cc: Steve Dickson <steved@redhat.com>
> ---
> 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(-)
>
> diff --git a/support/export/auth.c b/support/export/auth.c
> index 03ce4b8..2d7960f 100644
> --- a/support/export/auth.c
> +++ b/support/export/auth.c
> @@ -82,7 +82,7 @@ check_useipaddr(void)
> }
>
> unsigned int
> -auth_reload()
> +auth_reload(void)
> {
> struct stat stb;
> static ino_t last_inode;
> diff --git a/support/export/v4root.c b/support/export/v4root.c
> index c12a7d8..fbb0ad5 100644
> --- a/support/export/v4root.c
> +++ b/support/export/v4root.c
> @@ -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;
> diff --git a/support/export/xtab.c b/support/export/xtab.c
> index c888a80..e210ca9 100644
> --- a/support/export/xtab.c
> +++ b/support/export/xtab.c
> @@ -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);
> }
> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
> index 6ba615d..0897b22 100644
> --- a/utils/exportfs/exportfs.c
> +++ b/utils/exportfs/exportfs.c
> @@ -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);
> diff --git a/utils/mount/network.c b/utils/mount/network.c
> index ed2f825..01ead49 100644
> --- a/utils/mount/network.c
> +++ b/utils/mount/network.c
> @@ -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;
> /*
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] mountd: Check for return of stat function
2022-08-16 2:44 [PATCH v2 1/2] mountd: Check for return of stat function Khem Raj
2022-08-16 2:44 ` [PATCH v2 2/2] Fix function prototypes Khem Raj
2022-09-13 17:37 ` [PATCH v2 1/2] mountd: Check for return of stat function Steve Dickson
@ 2022-09-13 17:38 ` Steve Dickson
2 siblings, 0 replies; 5+ messages in thread
From: Steve Dickson @ 2022-09-13 17:38 UTC (permalink / raw)
To: Khem Raj; +Cc: Linux NFS Mailing list, Konstantin Khorenko
On 8/15/22 10:44 PM, Khem Raj wrote:
> 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 ||
> | ^ ~~
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Konstantin Khorenko <khorenko@virtuozzo.com>
Committed... (tag: nfs-utils-2-6-3-rc1)
steved
> Cc: Steve Dickson <steved@redhat.com>
> ---
> v2: rebased
>
> support/export/v4clients.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/support/export/v4clients.c b/support/export/v4clients.c
> index 5f15b61..3230251 100644
> --- a/support/export/v4clients.c
> +++ b/support/export/v4clients.c
> @@ -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)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-13 18:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-16 2:44 [PATCH v2 1/2] mountd: Check for return of stat function Khem Raj
2022-08-16 2:44 ` [PATCH v2 2/2] Fix function prototypes Khem Raj
2022-09-13 17:37 ` Steve Dickson
2022-09-13 17:37 ` [PATCH v2 1/2] mountd: Check for return of stat function Steve Dickson
2022-09-13 17:38 ` Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).