Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-04-24 07:16:48 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-04-24 07:16:48 +0200
commitf320850e4478884d92961355e1eec321c17da7cb (patch)
tree4b5cf3ebfd2cef2e9f6a382f2dc42f5e49615456
parent0fa8e39f58196d502d8f49517345cde9fc106fe1 (diff)
parentab6855e4f007ed24c4225e0202094be83deaff77 (diff)
Merge branch 'SLE12-SP3' into openSUSE-42.3
-rw-r--r--patches.fixes/0001-hpet-Fix-missing-character-in-the-__setup-code-of-hp.patch60
-rw-r--r--patches.fixes/NFS-Fix-dentry-revalidation-on-NFSv4-lookup.patch65
-rw-r--r--series.conf2
3 files changed, 127 insertions, 0 deletions
diff --git a/patches.fixes/0001-hpet-Fix-missing-character-in-the-__setup-code-of-hp.patch b/patches.fixes/0001-hpet-Fix-missing-character-in-the-__setup-code-of-hp.patch
new file mode 100644
index 0000000000..01c2358757
--- /dev/null
+++ b/patches.fixes/0001-hpet-Fix-missing-character-in-the-__setup-code-of-hp.patch
@@ -0,0 +1,60 @@
+From 24d48a61f2666630da130cc2ec2e526eacf229e3 Mon Sep 17 00:00:00 2001
+From: Buland Singh <bsingh@redhat.com>
+Date: Thu, 20 Dec 2018 17:35:24 +0530
+Subject: [PATCH] hpet: Fix missing '=' character in the __setup() code of
+ hpet_mmap_enable
+Git-commit: 24d48a61f2666630da130cc2ec2e526eacf229e3
+Patch-mainline: v5.1-rc1
+References: bsc#1129770
+
+Commit '3d035f580699 ("drivers/char/hpet.c: allow user controlled mmap for
+user processes")' introduced a new kernel command line parameter hpet_mmap,
+that is required to expose the memory map of the HPET registers to
+user-space. Unfortunately the kernel command line parameter 'hpet_mmap' is
+broken and never takes effect due to missing '=' character in the __setup()
+code of hpet_mmap_enable.
+
+Before this patch:
+
+dmesg output with the kernel command line parameter hpet_mmap=1
+
+[ 0.204152] HPET mmap disabled
+
+dmesg output with the kernel command line parameter hpet_mmap=0
+
+[ 0.204192] HPET mmap disabled
+
+After this patch:
+
+dmesg output with the kernel command line parameter hpet_mmap=1
+
+[ 0.203945] HPET mmap enabled
+
+dmesg output with the kernel command line parameter hpet_mmap=0
+
+[ 0.204652] HPET mmap disabled
+
+Fixes: 3d035f580699 ("drivers/char/hpet.c: allow user controlled mmap for user processes")
+Signed-off-by: Buland Singh <bsingh@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Reviewed-by: Fabian Baumanis <fabian.baumanis@suse.com>
+---
+ drivers/char/hpet.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
+index 4a22b4b41aef..9bffcd37cc7b 100644
+--- a/drivers/char/hpet.c
++++ b/drivers/char/hpet.c
+@@ -377,7 +377,7 @@ static __init int hpet_mmap_enable(char *str)
+ pr_info("HPET mmap %s\n", hpet_mmap_enabled ? "enabled" : "disabled");
+ return 1;
+ }
+-__setup("hpet_mmap", hpet_mmap_enable);
++__setup("hpet_mmap=", hpet_mmap_enable);
+
+ static int hpet_mmap(struct file *file, struct vm_area_struct *vma)
+ {
+--
+2.16.4
+
diff --git a/patches.fixes/NFS-Fix-dentry-revalidation-on-NFSv4-lookup.patch b/patches.fixes/NFS-Fix-dentry-revalidation-on-NFSv4-lookup.patch
new file mode 100644
index 0000000000..8a45ce5ca3
--- /dev/null
+++ b/patches.fixes/NFS-Fix-dentry-revalidation-on-NFSv4-lookup.patch
@@ -0,0 +1,65 @@
+From: Trond Myklebust <trond.myklebust@hammerspace.com>
+Date: Thu, 27 Sep 2018 17:12:33 -0400
+Subject: [PATCH] NFS: Fix dentry revalidation on NFSv4 lookup
+Git-commit: be189f7e7f03de35887e5a85ddcf39b91b5d7fc1
+Patch-mainline: v4.20
+References: bsc#1132618
+
+We need to ensure that inode and dentry revalidation occurs correctly
+on reopen of a file that is already open. Currently, we can end up
+not revalidating either in the case of NFSv4.0, due to the 'cached open'
+path.
+Let's fix that by ensuring that we only do cached open for the special
+cases of open recovery and delegation return.
+
+Reported-by: Stan Hu <stanhu@gmail.com>
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Acked-by: NeilBrown <neilb@suse.com>
+
+---
+ fs/nfs/nfs4proc.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -1211,12 +1211,20 @@ static bool nfs4_mode_match_open_stateid
+ return false;
+ }
+
+-static int can_open_cached(struct nfs4_state *state, fmode_t mode, int open_mode)
++static int can_open_cached(struct nfs4_state *state, fmode_t mode,
++ int open_mode, enum open_claim_type4 claim)
+ {
+ int ret = 0;
+
+ if (open_mode & (O_EXCL|O_TRUNC))
+ goto out;
++ switch (claim) {
++ case NFS4_OPEN_CLAIM_NULL:
++ case NFS4_OPEN_CLAIM_FH:
++ goto out;
++ default:
++ break;
++ }
+ switch (mode & (FMODE_READ|FMODE_WRITE)) {
+ case FMODE_READ:
+ ret |= test_bit(NFS_O_RDONLY_STATE, &state->flags) != 0
+@@ -1481,7 +1489,7 @@ static struct nfs4_state *nfs4_try_open_
+
+ for (;;) {
+ spin_lock(&state->owner->so_lock);
+- if (can_open_cached(state, fmode, open_mode)) {
++ if (can_open_cached(state, fmode, open_mode, claim)) {
+ update_open_stateflags(state, fmode);
+ spin_unlock(&state->owner->so_lock);
+ goto out_return_state;
+@@ -1976,7 +1984,8 @@ static void nfs4_open_prepare(struct rpc
+ if (data->state != NULL) {
+ struct nfs_delegation *delegation;
+
+- if (can_open_cached(data->state, data->o_arg.fmode, data->o_arg.open_flags))
++ if (can_open_cached(data->state, data->o_arg.fmode,
++ data->o_arg.open_flags, claim))
+ goto out_no_action;
+ rcu_read_lock();
+ delegation = rcu_dereference(NFS_I(data->state->inode)->delegation);
diff --git a/series.conf b/series.conf
index fc2cb9ce42..858cdcae85 100644
--- a/series.conf
+++ b/series.conf
@@ -24767,6 +24767,7 @@
patches.suse/uio-make-symbol-uio_class_registered-static.patch
patches.drivers/iommu-arm-smmu-ensure-that-page-table-updates-are-visible-before-tlbi
patches.fixes/0001-xen-blkfront-avoid-NULL-blkfront_info-dereference-on.patch
+ patches.fixes/NFS-Fix-dentry-revalidation-on-NFSv4-lookup.patch
patches.fixes/xprtrdma-Reset-credit-grant-properly-after-a-disconn.patch
patches.arch/powerpc-powernv-Don-t-select-the-cpufreq-governors.patch
patches.arch/powerpc-pseries-mm-Introducing-FW_FEATURE_BLOCK_REMO.patch
@@ -24918,6 +24919,7 @@
patches.drivers/brcmfmac-add-subtype-check-for-event-handling-in-dat.patch
patches.fixes/0001-crypto-tgr192-fix-unaligned-memory-access.patch
patches.fixes/0001-device-property-Fix-the-length-used-in-PROPERTY_ENTR.patch
+ patches.fixes/0001-hpet-Fix-missing-character-in-the-__setup-code-of-hp.patch
patches.suse/intel_th-gth-Fix-an-off-by-one-in-output-unassigning.patch
patches.fixes/0001-cdc-wdm-pass-return-value-of-recover_from_urb_loss.patch
patches.suse/0001-btrfs-relocation-Delay-reloc-tree-deletion-after-mer.patch