summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorJeff Layton <jlayton@kernel.org>2020-09-11 15:19:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-11 11:54:01 +0200
commitf82fe11a30aee5199855cf4837bf48e23ca02336 (patch)
tree49d817830fb947c10bb3b67b2580c00238ae262f /fs/ceph
parent82edffead58642796f085e9cd4c01a687883942c (diff)
downloadlinux-stable-f82fe11a30aee5199855cf4837bf48e23ca02336.tar.gz
linux-stable-f82fe11a30aee5199855cf4837bf48e23ca02336.tar.bz2
linux-stable-f82fe11a30aee5199855cf4837bf48e23ca02336.zip
ceph: use kill_anon_super helper
[ Upstream commit 470a5c77eac0e07bfe60413fb3d314b734392bc3 ] ceph open-codes this around some other activity and the rationale for it isn't clear. There is no need to delay free_anon_bdev until the end of kill_sb. Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Stable-dep-of: e7e607bd0048 ("ceph: defer stopping mdsc delayed_work") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/super.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index d40658d5e808..279334f95570 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -1174,14 +1174,13 @@ out_final:
static void ceph_kill_sb(struct super_block *s)
{
struct ceph_fs_client *fsc = ceph_sb_to_client(s);
- dev_t dev = s->s_dev;
dout("kill_sb %p\n", s);
ceph_mdsc_pre_umount(fsc->mdsc);
flush_fs_workqueues(fsc);
- generic_shutdown_super(s);
+ kill_anon_super(s);
fsc->client->extra_mon_dispatch = NULL;
ceph_fs_debugfs_cleanup(fsc);
@@ -1189,7 +1188,6 @@ static void ceph_kill_sb(struct super_block *s)
ceph_fscache_unregister_fs(fsc);
destroy_fs_client(fsc);
- free_anon_bdev(dev);
}
static struct file_system_type ceph_fs_type = {