---

yaml --- r: 199313 b: refs/heads/master c: aa91647 h: refs/heads/master i: 199311: a3a08fa v: v3
git-mirror · May 29, 2010 · 213d16e · 213d16e
1 parent 2e3d01c
commit 213d16e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0aa12fb439838a85802ab8b7fbb9bcfc3e6e05cb
+refs/heads/master: aa91647c898d62e869fcf35e977ab3c533be8fc1
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
@@ -1768,12 +1768,12 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
 	mutex_unlock(&mdsc->mutex);
 	dout("do_request waiting\n");
 	if (req->r_timeout) {
-		err = (long)wait_for_completion_interruptible_timeout(
+		err = (long)wait_for_completion_killable_timeout(
 			&req->r_completion, req->r_timeout);
 		if (err == 0)
 			err = -EIO;
 	} else {
-		err = wait_for_completion_interruptible(&req->r_completion);
+		err = wait_for_completion_killable(&req->r_completion);
 	}
 	dout("do_request waited, got %d\n", err);
 	mutex_lock(&mdsc->mutex);