* [PATCH 1/2] Move version.h into a common include directory
@ 2021-09-22 15:36 Steve Dickson
2021-09-22 15:36 ` [PATCH 2/2] mountd: only do NFSv4 logging on supported kernels Steve Dickson
2021-09-23 16:36 ` [PATCH 1/2] Move version.h into a common include directory Steve Dickson
0 siblings, 2 replies; 4+ messages in thread
From: Steve Dickson @ 2021-09-22 15:36 UTC (permalink / raw)
To: Linux NFS Mailing list
Signed-off-by: Steve Dickson <steved@redhat.com>
---
support/include/version.h | 1 +
utils/gssd/svcgssd_krb5.c | 2 +-
utils/nfsd/nfssvc.c | 2 +-
utils/nfsdcld/nfsdcld.c | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
create mode 120000 support/include/version.h
diff --git a/support/include/version.h b/support/include/version.h
new file mode 120000
index 00000000..b7db0bbb
--- /dev/null
+++ b/support/include/version.h
@@ -0,0 +1 @@
+../../utils/mount/version.h
\ No newline at end of file
diff --git a/utils/gssd/svcgssd_krb5.c b/utils/gssd/svcgssd_krb5.c
index 305d4751..2503c384 100644
--- a/utils/gssd/svcgssd_krb5.c
+++ b/utils/gssd/svcgssd_krb5.c
@@ -46,7 +46,7 @@
#include "gss_oids.h"
#include "err_util.h"
#include "svcgssd_krb5.h"
-#include "../mount/version.h"
+#include "version.h"
#define MYBUFLEN 1024
diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
index 720bdd97..46452d97 100644
--- a/utils/nfsd/nfssvc.c
+++ b/utils/nfsd/nfssvc.c
@@ -25,7 +25,7 @@
#include "nfslib.h"
#include "xlog.h"
#include "nfssvc.h"
-#include "../mount/version.h"
+#include "version.h"
#ifndef NFSD_FS_DIR
#define NFSD_FS_DIR "/proc/fs/nfsd"
diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c
index 636c3983..dbc7a57f 100644
--- a/utils/nfsdcld/nfsdcld.c
+++ b/utils/nfsdcld/nfsdcld.c
@@ -45,7 +45,7 @@
#include "cld.h"
#include "cld-internal.h"
#include "sqlite.h"
-#include "../mount/version.h"
+#include "version.h"
#include "conffile.h"
#include "legacy.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] mountd: only do NFSv4 logging on supported kernels.
2021-09-22 15:36 [PATCH 1/2] Move version.h into a common include directory Steve Dickson
@ 2021-09-22 15:36 ` Steve Dickson
2021-09-23 16:37 ` Steve Dickson
2021-09-23 16:36 ` [PATCH 1/2] Move version.h into a common include directory Steve Dickson
1 sibling, 1 reply; 4+ messages in thread
From: Steve Dickson @ 2021-09-22 15:36 UTC (permalink / raw)
To: Linux NFS Mailing list
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1979816
Signed-off-by: Steve Dickson <steved@redhat.com>
---
support/export/v4clients.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/support/export/v4clients.c b/support/export/v4clients.c
index dd985463..5e4f1058 100644
--- a/support/export/v4clients.c
+++ b/support/export/v4clients.c
@@ -10,6 +10,7 @@
#include <sys/inotify.h>
#include <errno.h>
#include "export.h"
+#include "version.h"
/* search.h declares 'struct entry' and nfs_prot.h
* does too. Easiest fix is to trick search.h into
@@ -23,6 +24,8 @@ static int clients_fd = -1;
void v4clients_init(void)
{
+ if (linux_version_code() < MAKE_VERSION(5, 3, 0))
+ return;
if (clients_fd >= 0)
return;
clients_fd = inotify_init1(IN_NONBLOCK);
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] Move version.h into a common include directory
2021-09-22 15:36 [PATCH 1/2] Move version.h into a common include directory Steve Dickson
2021-09-22 15:36 ` [PATCH 2/2] mountd: only do NFSv4 logging on supported kernels Steve Dickson
@ 2021-09-23 16:36 ` Steve Dickson
1 sibling, 0 replies; 4+ messages in thread
From: Steve Dickson @ 2021-09-23 16:36 UTC (permalink / raw)
To: Linux NFS Mailing list
On 9/22/21 11:36 AM, Steve Dickson wrote:
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... (tag: nfs-utils-2-5-5-rc3)
steved.
> ---
> support/include/version.h | 1 +
> utils/gssd/svcgssd_krb5.c | 2 +-
> utils/nfsd/nfssvc.c | 2 +-
> utils/nfsdcld/nfsdcld.c | 2 +-
> 4 files changed, 4 insertions(+), 3 deletions(-)
> create mode 120000 support/include/version.h
>
> diff --git a/support/include/version.h b/support/include/version.h
> new file mode 120000
> index 00000000..b7db0bbb
> --- /dev/null
> +++ b/support/include/version.h
> @@ -0,0 +1 @@
> +../../utils/mount/version.h
> \ No newline at end of file
> diff --git a/utils/gssd/svcgssd_krb5.c b/utils/gssd/svcgssd_krb5.c
> index 305d4751..2503c384 100644
> --- a/utils/gssd/svcgssd_krb5.c
> +++ b/utils/gssd/svcgssd_krb5.c
> @@ -46,7 +46,7 @@
> #include "gss_oids.h"
> #include "err_util.h"
> #include "svcgssd_krb5.h"
> -#include "../mount/version.h"
> +#include "version.h"
>
> #define MYBUFLEN 1024
>
> diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
> index 720bdd97..46452d97 100644
> --- a/utils/nfsd/nfssvc.c
> +++ b/utils/nfsd/nfssvc.c
> @@ -25,7 +25,7 @@
> #include "nfslib.h"
> #include "xlog.h"
> #include "nfssvc.h"
> -#include "../mount/version.h"
> +#include "version.h"
>
> #ifndef NFSD_FS_DIR
> #define NFSD_FS_DIR "/proc/fs/nfsd"
> diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c
> index 636c3983..dbc7a57f 100644
> --- a/utils/nfsdcld/nfsdcld.c
> +++ b/utils/nfsdcld/nfsdcld.c
> @@ -45,7 +45,7 @@
> #include "cld.h"
> #include "cld-internal.h"
> #include "sqlite.h"
> -#include "../mount/version.h"
> +#include "version.h"
> #include "conffile.h"
> #include "legacy.h"
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] mountd: only do NFSv4 logging on supported kernels.
2021-09-22 15:36 ` [PATCH 2/2] mountd: only do NFSv4 logging on supported kernels Steve Dickson
@ 2021-09-23 16:37 ` Steve Dickson
0 siblings, 0 replies; 4+ messages in thread
From: Steve Dickson @ 2021-09-23 16:37 UTC (permalink / raw)
To: Linux NFS Mailing list
On 9/22/21 11:36 AM, Steve Dickson wrote:
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1979816
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... (tag: nfs-utils-2-5-5-rc3)
steved.
> ---
> support/export/v4clients.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/support/export/v4clients.c b/support/export/v4clients.c
> index dd985463..5e4f1058 100644
> --- a/support/export/v4clients.c
> +++ b/support/export/v4clients.c
> @@ -10,6 +10,7 @@
> #include <sys/inotify.h>
> #include <errno.h>
> #include "export.h"
> +#include "version.h"
>
> /* search.h declares 'struct entry' and nfs_prot.h
> * does too. Easiest fix is to trick search.h into
> @@ -23,6 +24,8 @@ static int clients_fd = -1;
>
> void v4clients_init(void)
> {
> + if (linux_version_code() < MAKE_VERSION(5, 3, 0))
> + return;
> if (clients_fd >= 0)
> return;
> clients_fd = inotify_init1(IN_NONBLOCK);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-23 16:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 15:36 [PATCH 1/2] Move version.h into a common include directory Steve Dickson
2021-09-22 15:36 ` [PATCH 2/2] mountd: only do NFSv4 logging on supported kernels Steve Dickson
2021-09-23 16:37 ` Steve Dickson
2021-09-23 16:36 ` [PATCH 1/2] Move version.h into a common include directory Steve Dickson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.