diff options
| author | Sage Weil <sage@newdream.net> | 2010-08-11 14:51:23 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-08-22 15:04:43 -0700 |
| commit | f3c60c5918f26ea16761ddc8b12d8401a3db626b (patch) | |
| tree | 00bde7250b6753910a38b454c7a9cee2eb7e84e7 /fs/ceph/mds_client.h | |
| parent | e56fa10e92e077d456cbc33b7025032887772b33 (diff) | |
| download | op-kernel-dev-f3c60c5918f26ea16761ddc8b12d8401a3db626b.zip op-kernel-dev-f3c60c5918f26ea16761ddc8b12d8401a3db626b.tar.gz | |
ceph: fix multiple mds session shutdown
The use of a completion when waiting for session shutdown during umount is
inappropriate, given the complexity of the condition. For multiple MDS's,
this resulted in the umount thread spinning, often preventing the session
close message from being processed in some cases.
Switch to a waitqueue and defined a condition helper. This cleans things
up nicely.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mds_client.h')
| -rw-r--r-- | fs/ceph/mds_client.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index ab7e89f..c98267c 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -234,7 +234,8 @@ struct ceph_mds_client { struct mutex mutex; /* all nested structures */ struct ceph_mdsmap *mdsmap; - struct completion safe_umount_waiters, session_close_waiters; + struct completion safe_umount_waiters; + wait_queue_head_t session_close_wq; struct list_head waiting_for_map; struct ceph_mds_session **sessions; /* NULL for mds if no session */ |
