Attachment 1483380 Details for Bug 1625032 – Supress 4.0 flag unless kernel supports it

[patch] Supress 4.0 flag unless kernel supports it

nfs-utils-fixup.patch (text/plain), 1.43 KB, created by Alice Mitchell on 2018-09-14 17:28:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alice Mitchell

Created: 2018-09-14 17:28:40 UTC

Size: 1.43 KB

patch

obsolete

>diff -urN nfs-utils-1.3.0-59/utils/nfsd/nfssvc.c nfs-utils-1.3.0-59.fix/utils/nfsd/nfssvc.c
>--- nfs-utils-1.3.0-59/utils/nfsd/nfssvc.c	2018-09-12 13:59:27.000000000 +0100
>+++ nfs-utils-1.3.0-59.fix/utils/nfsd/nfssvc.c	2018-09-14 18:21:12.000000000 +0100
>@@ -24,6 +24,7 @@
> #include "nfslib.h"
> #include "xlog.h"
> #include "nfssvc.h"
>+#include "../mount/version.h"
> 
> #ifndef NFSD_FS_DIR
> #define NFSD_FS_DIR	  "/proc/fs/nfsd"
>@@ -368,11 +369,11 @@
> }
> 
> static int
>-nfssvc_print_vers(char *ptr, unsigned size, unsigned vers, unsigned minorvers,
>+nfssvc_print_vers(char *ptr, unsigned size, unsigned vers, int minorvers,
> 		int isset)
> {
> 	char sign = isset ? '+' : '-';
>-	if (minorvers == 0)
>+	if (minorvers < 0)
> 		return snprintf(ptr, size, "%c%u ", sign, vers);
> 	return snprintf(ptr, size, "%c%u.%u ", sign, vers, minorvers);
> }
>@@ -387,13 +388,15 @@
> 	if (fd < 0)
> 		return;
> 
>-	for (n = NFSD_MINVERS; n <= ((NFSD_MAXVERS < 3) ? NFSD_MAXVERS : 3); n++)
>+	for (n = NFSD_MINVERS; n <= ((NFSD_MAXVERS < 4) ? NFSD_MAXVERS : 4); n++)
> 		off += nfssvc_print_vers(&buf[off], sizeof(buf) - off,
>-				n, 0, NFSCTL_VERISSET(ctlbits, n));
>+				n, -1, NFSCTL_VERISSET(ctlbits, n));
> 
> 	for (n = 0; n <= NFS4_MAXMINOR; n++) {
> 		if (!NFSCTL_MINORISSET(minorversset, n))
> 			continue;
>+		if (n == 0 && linux_version_code() < MAKE_VERSION(4, 11, 0))
>+			continue;
> 		off += nfssvc_print_vers(&buf[off], sizeof(buf) - off,
> 				4, n, NFSCTL_MINORISSET(minorvers, n));
> 	}

Actions: View | Diff

Attachments on bug 1625032: 1483344 | 1483380 | 1485327