diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-11 05:43:56 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-15 20:26:40 +0200 |
| commit | f3dea7edd3d449fe7a6d402c1ce56a294b985261 (patch) | |
| tree | dd8d3334a38320ba7918ca9ccc6e8fe2f943c867 /net/ceph/ceph_common.c | |
| parent | libceph: transition socket state prior to actual connect (diff) | |
| download | linux-f3dea7edd3d449fe7a6d402c1ce56a294b985261.tar.xz linux-f3dea7edd3d449fe7a6d402c1ce56a294b985261.zip | |
libceph: flush msgr queue during mon_client shutdown
We need to flush the msgr workqueue during mon_client shutdown to
ensure that any work affecting our embedded ceph_connection is
finished so that we can be safely destroyed.
Previously, we were flushing the work queue after osd_client
shutdown and before mon_client shutdown to ensure that any osd
connection refs to authorizers are flushed. Remove the redundant
flush, and document in the comment that the mon_client flush is
needed to cover that case as well.
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'net/ceph/ceph_common.c')
| -rw-r--r-- | net/ceph/ceph_common.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index 2de3ea1bbd64..c815f31a1a3f 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c @@ -498,13 +498,6 @@ void ceph_destroy_client(struct ceph_client *client) /* unmount */ ceph_osdc_stop(&client->osdc); - /* - * make sure osd connections close out before destroying the - * auth module, which is needed to free those connections' - * ceph_authorizers. - */ - ceph_msgr_flush(); - ceph_monc_stop(&client->monc); ceph_debugfs_client_cleanup(client); |