aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2013-10-30 21:10:47 -0400
committerSage Weil <sage@inktank.com>2013-11-23 14:01:05 -0500
commitfc55d2c9448b34218ca58733a6f51fbede09575b (patch)
tree3aacd587707e00cd58ae7db659d73993ef7703ef
parenteb1b8af33c2e42a9a57fc0a7588f4a7b255d2e79 (diff)
ceph: wake up 'safe' waiters when unregistering request
We also need to wake up 'safe' waiters if error occurs or request aborted. Otherwise sync(2)/fsync(2) may hang forever. Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com> Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--fs/ceph/mds_client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 8ef79266d064..d90861f45210 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -644,6 +644,8 @@ static void __unregister_request(struct ceph_mds_client *mdsc,
644 req->r_unsafe_dir = NULL; 644 req->r_unsafe_dir = NULL;
645 } 645 }
646 646
647 complete_all(&req->r_safe_completion);
648
647 ceph_mdsc_put_request(req); 649 ceph_mdsc_put_request(req);
648} 650}
649 651
@@ -2186,7 +2188,6 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
2186 if (head->safe) { 2188 if (head->safe) {
2187 req->r_got_safe = true; 2189 req->r_got_safe = true;
2188 __unregister_request(mdsc, req); 2190 __unregister_request(mdsc, req);
2189 complete_all(&req->r_safe_completion);
2190 2191
2191 if (req->r_got_unsafe) { 2192 if (req->r_got_unsafe) {
2192 /* 2193 /*