From 213d16ef93543a44e6b3be83b4c606cc4b342af0 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 24 May 2010 11:15:51 -0700
Subject: [PATCH] --- yaml --- r: 199313 b: refs/heads/master c:
 aa91647c898d62e869fcf35e977ab3c533be8fc1 h: refs/heads/master i:   199311:
 a3a08fabf67c60523af9605a0515bd7af4c91704 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ceph/mds_client.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bdd579df8161..29e5926cd831 100644
--- 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
index 885aa5710cfd..08413c8a85b2 100644
--- 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);