Commit 3ee5a701 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov

ceph: call ceph_mdsc_destroy from destroy_fs_client

They're always called in succession.
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent cf73d882
...@@ -731,6 +731,7 @@ static void destroy_fs_client(struct ceph_fs_client *fsc) ...@@ -731,6 +731,7 @@ static void destroy_fs_client(struct ceph_fs_client *fsc)
{ {
dout("destroy_fs_client %p\n", fsc); dout("destroy_fs_client %p\n", fsc);
ceph_mdsc_destroy(fsc);
destroy_workqueue(fsc->inode_wq); destroy_workqueue(fsc->inode_wq);
destroy_workqueue(fsc->cap_wq); destroy_workqueue(fsc->cap_wq);
...@@ -1105,7 +1106,6 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type, ...@@ -1105,7 +1106,6 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type,
} }
if (ceph_sb_to_client(sb) != fsc) { if (ceph_sb_to_client(sb) != fsc) {
ceph_mdsc_destroy(fsc);
destroy_fs_client(fsc); destroy_fs_client(fsc);
fsc = ceph_sb_to_client(sb); fsc = ceph_sb_to_client(sb);
dout("get_sb got existing client %p\n", fsc); dout("get_sb got existing client %p\n", fsc);
...@@ -1131,7 +1131,6 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type, ...@@ -1131,7 +1131,6 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type,
goto out_final; goto out_final;
out: out:
ceph_mdsc_destroy(fsc);
destroy_fs_client(fsc); destroy_fs_client(fsc);
out_final: out_final:
dout("ceph_mount fail %ld\n", PTR_ERR(res)); dout("ceph_mount fail %ld\n", PTR_ERR(res));
...@@ -1155,8 +1154,6 @@ static void ceph_kill_sb(struct super_block *s) ...@@ -1155,8 +1154,6 @@ static void ceph_kill_sb(struct super_block *s)
ceph_fscache_unregister_fs(fsc); ceph_fscache_unregister_fs(fsc);
ceph_mdsc_destroy(fsc);
destroy_fs_client(fsc); destroy_fs_client(fsc);
free_anon_bdev(dev); free_anon_bdev(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment