2011-12-08 05:51:42

by Mike Frysinger

Subject: [PATCH] nfsctl: fix building with newer arches

Newer arches omitting both nfsctl and nfsservctl which breaks nfsctl.

Signed-off-by: Mike Frysinger <[email protected]>
---
support/nfs/nfsctl.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/support/nfs/nfsctl.c b/support/nfs/nfsctl.c
index 89fa1a4..fec775f 100644
--- a/support/nfs/nfsctl.c
+++ b/support/nfs/nfsctl.c
@@ -11,16 +11,22 @@
#endif

#include <unistd.h>
+#include <errno.h>
#include <asm/unistd.h>
#include "nfslib.h"

/* compatibility hack... */
-#ifndef __NR_nfsctl
+#if !defined(__NR_nfsctl) && defined(__NR_nfsservctl)
#define __NR_nfsctl __NR_nfsservctl
#endif

int
nfsctl (int cmd, struct nfsctl_arg * argp, union nfsctl_res * resp)
{
+#ifdef __NR_nfsctl
return syscall (__NR_nfsctl, cmd, argp, resp);
+#else
+ errno = ENOSYS;
+ return -1;
+#endif
}
--
1.7.6.1

2012-01-05 21:42:33

by Steve Dickson

Subject: Re: [PATCH] nfsctl: fix building with newer arches

On 12/08/2011 12:51 AM, Mike Frysinger wrote:
> Newer arches omitting both nfsctl and nfsservctl which breaks nfsctl.
>
> Signed-off-by: Mike Frysinger <[email protected]>
Committed...

steved.
> ---
> support/nfs/nfsctl.c | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/support/nfs/nfsctl.c b/support/nfs/nfsctl.c
> index 89fa1a4..fec775f 100644
> --- a/support/nfs/nfsctl.c
> +++ b/support/nfs/nfsctl.c
> @@ -11,16 +11,22 @@
> #endif
>
> #include <unistd.h>
> +#include <errno.h>
> #include <asm/unistd.h>
> #include "nfslib.h"
>
> /* compatibility hack... */
> -#ifndef __NR_nfsctl
> +#if !defined(__NR_nfsctl) && defined(__NR_nfsservctl)
> #define __NR_nfsctl __NR_nfsservctl
> #endif
>
> int
> nfsctl (int cmd, struct nfsctl_arg * argp, union nfsctl_res * resp)
> {
> +#ifdef __NR_nfsctl
> return syscall (__NR_nfsctl, cmd, argp, resp);
> +#else
> + errno = ENOSYS;
> + return -1;
> +#endif
> }