Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f82fe11a authored by Jeff Layton's avatar Jeff Layton Committed by Greg Kroah-Hartman
Browse files

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: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Stable-dep-of: e7e607bd0048 ("ceph: defer stopping mdsc delayed_work")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 82edffea

fs/ceph/super.c

+1 −3
Original line number Diff line number Diff line
@@ -1174,14 +1174,13 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type, 
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 = {