Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-20 17:01:51 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-20 17:01:51 +0200
commit5e50ac5ddf8574ff9f509b3e8237fbb684913848 (patch)
tree3fe570eca7fa2e1ac5bf0bb8c8cc40c989f02891
parent3eec3e8321c34fd28196be2a7a52cf987ac341b6 (diff)
parent4f6fcf98d60d39c27d98e4609b2fabd31701e493 (diff)
Merge branch 'users/nfbrown/SLE15/for-next' into SLE15
Pull nfs fix from Neil Brown
-rw-r--r--patches.suse/NFS-optional-NFSv4_2-fix.patch30
-rw-r--r--series.conf1
2 files changed, 31 insertions, 0 deletions
diff --git a/patches.suse/NFS-optional-NFSv4_2-fix.patch b/patches.suse/NFS-optional-NFSv4_2-fix.patch
new file mode 100644
index 0000000000..a7c0760075
--- /dev/null
+++ b/patches.suse/NFS-optional-NFSv4_2-fix.patch
@@ -0,0 +1,30 @@
+From: NeilBrown <neilb@suse.com>
+Subject: Don't restrict NFSv4.2 on openSUSE
+Patch-mainline: Never, suse specific
+References: bsc#1138719
+
+We default the nfs.max_minor_version to 1 on some SLE kernels,
+but don't need to do that for openSUSE - Leap or Tumbleweed
+
+---
+ fs/nfs/super.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/fs/nfs/super.c
++++ b/fs/nfs/super.c
+@@ -76,11 +76,15 @@
+ #define NFS_DEFAULT_VERSION 2
+ #endif
+
++#ifdef CONFIG_SUSE_PRODUCT_SLE
+ #if CONFIG_SUSE_VERSION < 15 || (CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 0)
+ static int max_minor_version = 1;
+ #else
+ static int max_minor_version = 2;
+ #endif
++#else
++static int max_minor_version = 2;
++#endif
+
+ #define NFS_MAX_CONNECTIONS 16
+
diff --git a/series.conf b/series.conf
index 06b0e5c4d1..3fac1e97b1 100644
--- a/series.conf
+++ b/series.conf
@@ -22964,6 +22964,7 @@
patches.kabi/sunrpc-use-after-free-in-svc_process_common.patch
patches.fixes/sunrpc-cache-handle-missing-listeners-better.patch
patches.suse/NFS-optional-NFSv4_2.patch
+ patches.suse/NFS-optional-NFSv4_2-fix.patch
########################################################
# Overlayfs