[3.11.y.z extended stable] Patch "ceph: wake up 'safe' waiters when unregistering request" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Thu Jan 9 12:02:34 UTC 2014


This is a note to let you know that I have just added a patch titled

    ceph: wake up 'safe' waiters when unregistering request

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 29ad6b839fab3d958f5a26b289e2e573df140ac1 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zheng.z.yan at intel.com>
Date: Thu, 31 Oct 2013 09:10:47 +0800
Subject: ceph: wake up 'safe' waiters when unregistering request

commit fc55d2c9448b34218ca58733a6f51fbede09575b upstream.

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 at intel.com>
Signed-off-by: Sage Weil <sage at inktank.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 fs/ceph/mds_client.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index c9c69cd..17b97ff 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -639,6 +639,8 @@ static void __unregister_request(struct ceph_mds_client *mdsc,
 		req->r_unsafe_dir = NULL;
 	}

+	complete_all(&req->r_safe_completion);
+
 	ceph_mdsc_put_request(req);
 }

@@ -2155,7 +2157,6 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
 	if (head->safe) {
 		req->r_got_safe = true;
 		__unregister_request(mdsc, req);
-		complete_all(&req->r_safe_completion);

 		if (req->r_got_unsafe) {
 			/*
--
1.8.3.2





More information about the kernel-team mailing list