aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-03-25 16:27:48 -0400
committerSage Weil <sage@newdream.net>2011-03-25 16:27:48 -0400
commitef550f6f4f6c9345a27ec85d98f4f7de1adce79c (patch)
treedafd71f3e7fe46ed685b5ab3fd62c2bb7d3cb679
parent59c2be1e4d42c0d4949cecdeef3f37070a1fbc13 (diff)
ceph: flush msgr_wq during mds_client shutdown
The release method for mds connections uses a backpointer to the mds_client, so we need to flush the workqueue of any pending work (and ceph_connection references) prior to freeing the mds_client. This fixes an oops easily triggered under UML by while true ; do mount ... ; umount ... ; done Also fix an outdated comment: the flush in ceph_destroy_client only flushes OSD connections out. This bug is basically an artifact of the ceph -> ceph+libceph conversion. Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/mds_client.c6
-rw-r--r--net/ceph/ceph_common.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index a1ee8fa3a8e..f60b07b0feb 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3215,9 +3215,15 @@ void ceph_mdsc_destroy(struct ceph_fs_client *fsc)
3215{ 3215{
3216 struct ceph_mds_client *mdsc = fsc->mdsc; 3216 struct ceph_mds_client *mdsc = fsc->mdsc;
3217 3217
3218 dout("mdsc_destroy %p\n", mdsc);
3218 ceph_mdsc_stop(mdsc); 3219 ceph_mdsc_stop(mdsc);
3220
3221 /* flush out any connection work with references to us */
3222 ceph_msgr_flush();
3223
3219 fsc->mdsc = NULL; 3224 fsc->mdsc = NULL;
3220 kfree(mdsc); 3225 kfree(mdsc);
3226 dout("mdsc_destroy %p done\n", mdsc);
3221} 3227}
3222 3228
3223 3229
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 95f96ab94bb..9bbb356b12e 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -394,8 +394,8 @@ void ceph_destroy_client(struct ceph_client *client)
394 ceph_osdc_stop(&client->osdc); 394 ceph_osdc_stop(&client->osdc);
395 395
396 /* 396 /*
397 * make sure mds and osd connections close out before destroying 397 * make sure osd connections close out before destroying the
398 * the auth module, which is needed to free those connections' 398 * auth module, which is needed to free those connections'
399 * ceph_authorizers. 399 * ceph_authorizers.
400 */ 400 */
401 ceph_msgr_flush(); 401 ceph_msgr_flush();