From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 18 Oct 2018 12:29:35 +0000 (+0200)
Subject: 4.18-stable patches
X-Git-Tag: v4.18.16~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fb611245c0f3f82d1fd3511d2c59b233a2b2cb7;p=thirdparty%2Fkernel%2Fstable-queue.git

4.18-stable patches

added patches:
	revert-vfs-fix-freeze-protection-in-mnt_want_write_file-for-overlayfs.patch
---

diff --git a/queue-4.18/revert-vfs-fix-freeze-protection-in-mnt_want_write_file-for-overlayfs.patch b/queue-4.18/revert-vfs-fix-freeze-protection-in-mnt_want_write_file-for-overlayfs.patch
new file mode 100644
index 00000000000..61c68d6d2a2
--- /dev/null
+++ b/queue-4.18/revert-vfs-fix-freeze-protection-in-mnt_want_write_file-for-overlayfs.patch
@@ -0,0 +1,47 @@
+From 05618d0a9e417b6b9bd03ae27770b13b2abe5271 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 18 Oct 2018 14:22:54 +0200
+Subject: Revert "vfs: fix freeze protection in mnt_want_write_file() for overlayfs"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 5e1002ab5c9bde81a0c1eed12f243987e98f7bd0 which was
+commit a6795a585929d94ca3e931bc8518f8deb8bbe627 upstream.
+
+Turns out this causes problems and was to fix a patch only in the 4.19
+and newer tree.
+
+Reported-by: Amir Goldstein <amir73il@gmail.com>
+Cc: Miklos Szeredi <mszeredi@redhat.com>
+Cc: Christoph Hellwig <hch@lst.de>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/namespace.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -446,10 +446,10 @@ int mnt_want_write_file_path(struct file
+ {
+ 	int ret;
+ 
+-	sb_start_write(file_inode(file)->i_sb);
++	sb_start_write(file->f_path.mnt->mnt_sb);
+ 	ret = __mnt_want_write_file(file);
+ 	if (ret)
+-		sb_end_write(file_inode(file)->i_sb);
++		sb_end_write(file->f_path.mnt->mnt_sb);
+ 	return ret;
+ }
+ 
+@@ -540,8 +540,7 @@ void __mnt_drop_write_file(struct file *
+ 
+ void mnt_drop_write_file_path(struct file *file)
+ {
+-	__mnt_drop_write_file(file);
+-	sb_end_write(file_inode(file)->i_sb);
++	mnt_drop_write(file->f_path.mnt);
+ }
+ 
+ void mnt_drop_write_file(struct file *file)
diff --git a/queue-4.18/series b/queue-4.18/series
index c5415b8f8da..d5614441505 100644
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -47,3 +47,4 @@ powerpc-tm-avoid-possible-userspace-r1-corruption-on-reclaim.patch
 powerpc-numa-use-associativity-if-vphn-hcall-is-successful.patch
 iommu-amd-return-devid-as-alias-for-acpi-hid-devices.patch
 x86-boot-fix-kexec-booting-failure-in-the-sev-bit-detection-code.patch
+revert-vfs-fix-freeze-protection-in-mnt_want_write_file-for-overlayfs.patch