aboutsummaryrefslogtreecommitdiff
path: root/fs/ceph/super.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-05-29 09:41:23 -0700
committerSage Weil <sage@newdream.net>2010-05-29 09:42:03 -0700
commita922d38fd10d55d5033f10df15baf966e8f5b18c (patch)
tree306f73dedd5482f09bdac6dc9ecb5285f95b316f /fs/ceph/super.c
parentdd1c9057366f329911180e9000e2b425f23fc287 (diff)
ceph: close out mds, osd connections before stopping auth
The auth module (part of the mon_client) is needed to free any ceph_authorizer(s) used by the mds and osd connections. Flush the msgr workqueue before stopping monc to ensure that the destroy_authorizer auth op is available when those connections are closed out. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/super.c')
-rw-r--r--fs/ceph/super.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 9b46bb951e1..5cf6fba8b70 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -669,9 +669,17 @@ static void ceph_destroy_client(struct ceph_client *client)
/* unmount */
ceph_mdsc_stop(&client->mdsc);
- ceph_monc_stop(&client->monc);
ceph_osdc_stop(&client->osdc);
+ /*
+ * make sure mds and 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_adjust_min_caps(-client->min_caps);
ceph_debugfs_client_cleanup(client);