lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceph: make mds requests killable, not interruptible

Browse Source 
The underlying problem is that many mds requests can't be restarted.  For
example, a restarted create() would return -EEXIST if the original request
succeeds.  However, we do not want a hung MDS to hang the client too.  So,
use the _killable wait_for_completion variants to abort on SIGKILL but
nothing else.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil
2010-05-24 11:15:51 -07:00
parent 0aa12fb439
commit aa91647c89
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ceph/mds_client.c
View File

@@ -1768,12 +1768,12 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
mutex_unlock(&mdsc->mutex); mutex_unlock(&mdsc->mutex);
dout("do_request waiting\n"); dout("do_request waiting\n");
if (req->r_timeout) { if (req->r_timeout) {
err = (long)wait_for_completion_interruptible_timeout( err = (long)wait_for_completion_killable_timeout(
&req->r_completion, req->r_timeout); &req->r_completion, req->r_timeout);
if (err == 0) if (err == 0)
err = -EIO; err = -EIO;
} else { } 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); dout("do_request waited, got %d\n", err);
mutex_lock(&mdsc->mutex); mutex_lock(&mdsc->mutex);