Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-10-04 17:37:43 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-10-04 17:37:43 +0200
commite36113e3dd7ddda262a7ed17880460eda4ca212f (patch)
tree97f1de9a0cab96181ba636de0b743008d8fe749e
parente0b2c1f92a559c888a2ffcce9f191ed1ff79402b (diff)
parent92df5d807119f18e4e599429b9951d5f84d9ef20 (diff)
Merge branch 'users/lhenriques/SLE15/for-next' into SLE15
Pull a ceph fix from Luis Henriques
-rw-r--r--patches.suse/ceph-use-ceph_evict_inode-to-cleanup-inode-s-resource.patch90
-rw-r--r--series.conf1
2 files changed, 91 insertions, 0 deletions
diff --git a/patches.suse/ceph-use-ceph_evict_inode-to-cleanup-inode-s-resource.patch b/patches.suse/ceph-use-ceph_evict_inode-to-cleanup-inode-s-resource.patch
new file mode 100644
index 0000000000..daf9331c08
--- /dev/null
+++ b/patches.suse/ceph-use-ceph_evict_inode-to-cleanup-inode-s-resource.patch
@@ -0,0 +1,90 @@
+From: "Yan, Zheng" <zyan@redhat.com>
+Date: Tue, 1 Oct 2019 17:24:25 -0400
+Subject: ceph: use ceph_evict_inode to cleanup inode's resource
+Git-commit: 87bc5b895d94a0f40fe170d4cf5771c8e8f85d15
+Patch-mainline: v5.3-rc1
+References: bsc#1148133
+
+[ Upstream commit 87bc5b895d94a0f40fe170d4cf5771c8e8f85d15 ]
+
+remove_session_caps() relies on __wait_on_freeing_inode(), to wait for
+freeing inode to remove its caps. But VFS wakes freeing inode waiters
+before calling destroy_inode().
+
+[ jlayton: mainline moved to ->free_inode before the original patch was
+ merged. This backport reinstates ceph_destroy_inode and just
+ has it do the call_rcu call. ]
+
+Cc: stable@vger.kernel.org
+Link: https://tracker.ceph.com/issues/40102
+Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
+Reviewed-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Acked-by: Luis Henriques <lhenriques@suse.com>
+[luis: cherry-pick from stable linux-v4.19]
+---
+ fs/ceph/inode.c | 10 ++++++++--
+ fs/ceph/super.c | 1 +
+ fs/ceph/super.h | 1 +
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
+index 11f19432a74c..c06845237cba 100644
+--- a/fs/ceph/inode.c
++++ b/fs/ceph/inode.c
+@@ -528,13 +528,16 @@ static void ceph_i_callback(struct rcu_head *head)
+ kmem_cache_free(ceph_inode_cachep, ci);
+ }
+
+-void ceph_destroy_inode(struct inode *inode)
++void ceph_evict_inode(struct inode *inode)
+ {
+ struct ceph_inode_info *ci = ceph_inode(inode);
+ struct ceph_inode_frag *frag;
+ struct rb_node *n;
+
+- dout("destroy_inode %p ino %llx.%llx\n", inode, ceph_vinop(inode));
++ dout("evict_inode %p ino %llx.%llx\n", inode, ceph_vinop(inode));
++
++ truncate_inode_pages_final(&inode->i_data);
++ clear_inode(inode);
+
+ ceph_fscache_unregister_inode_cookie(ci);
+
+@@ -576,7 +579,10 @@ void ceph_destroy_inode(struct inode *inode)
+ ceph_buffer_put(ci->i_xattrs.prealloc_blob);
+
+ ceph_put_string(rcu_dereference_raw(ci->i_layout.pool_ns));
++}
+
++void ceph_destroy_inode(struct inode *inode)
++{
+ call_rcu(&inode->i_rcu, ceph_i_callback);
+ }
+
+diff --git a/fs/ceph/super.c b/fs/ceph/super.c
+index c5cf46e43f2e..ccab249a37f6 100644
+--- a/fs/ceph/super.c
++++ b/fs/ceph/super.c
+@@ -830,6 +830,7 @@ static const struct super_operations ceph_super_ops = {
+ .destroy_inode = ceph_destroy_inode,
+ .write_inode = ceph_write_inode,
+ .drop_inode = ceph_drop_inode,
++ .evict_inode = ceph_evict_inode,
+ .sync_fs = ceph_sync_fs,
+ .put_super = ceph_put_super,
+ .remount_fs = ceph_remount,
+diff --git a/fs/ceph/super.h b/fs/ceph/super.h
+index 018019309790..8d3eabf06d66 100644
+--- a/fs/ceph/super.h
++++ b/fs/ceph/super.h
+@@ -854,6 +854,7 @@ static inline bool __ceph_have_pending_cap_snap(struct ceph_inode_info *ci)
+ extern const struct inode_operations ceph_file_iops;
+
+ extern struct inode *ceph_alloc_inode(struct super_block *sb);
++extern void ceph_evict_inode(struct inode *inode);
+ extern void ceph_destroy_inode(struct inode *inode);
+ extern int ceph_drop_inode(struct inode *inode);
+
+
diff --git a/series.conf b/series.conf
index 9d5852ec67..1b5ac6b642 100644
--- a/series.conf
+++ b/series.conf
@@ -24174,6 +24174,7 @@
patches.suse/ceph-hold-i_ceph_lock-when-removing-caps-for-freeing-inode.patch
patches.suse/ceph-don-t-blindly-unregister-session-that-is-in-opening-state.patch
patches.suse/ceph-remove-request-from-waiting-list-before-unregister.patch
+ patches.suse/ceph-use-ceph_evict_inode-to-cleanup-inode-s-resource.patch
patches.suse/cifs-Use-kmemdup-in-SMB2_ioctl_init-.patch
patches.suse/fs-cifs-Drop-unlikely-before-IS_ERR-_OR_NULL-.patch
patches.suse/SMB3-Add-SMB3-1-1-GCM-to-negotiated-crypto-algorigthms.patch