diff options
author | Sage Weil <sage@newdream.net> | 2011-03-25 16:27:48 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2011-03-25 16:27:48 -0400 |
commit | ef550f6f4f6c9345a27ec85d98f4f7de1adce79c (patch) | |
tree | dafd71f3e7fe46ed685b5ab3fd62c2bb7d3cb679 /net | |
parent | 59c2be1e4d42c0d4949cecdeef3f37070a1fbc13 (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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/ceph_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |