Skip to content

L
linux-davinci
Commit e2885f06 authored by Sage Weil's avatar Sage Weil
Browse files
Options

ceph: make mds ops interruptible 

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent cf3e5c40
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
fs/ceph/mds_client.c
View file @ e2885f06
...@@ -1597,14 +1597,17 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc, ...@@ -1597,14 +1597,17 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
if (!req->r_reply) { if (!req->r_reply) {
mutex_unlock(&mdsc->mutex); mutex_unlock(&mdsc->mutex);
if (req->r_timeout) { if (req->r_timeout) {
err = wait_for_completion_timeout(&req->r_completion, err = (long)wait_for_completion_interruptible_timeout(
req->r_timeout); &req->r_completion, req->r_timeout);
if (err > 0) if (err == 0)
err = 0;
else if (err == 0)
req->r_reply = ERR_PTR(-EIO); req->r_reply = ERR_PTR(-EIO);
else if (err < 0)
req->r_reply = ERR_PTR(err);
} else { } else {
wait_for_completion(&req->r_completion); err = wait_for_completion_interruptible(
&req->r_completion);
if (err)
req->r_reply = ERR_PTR(err);
} }
mutex_lock(&mdsc->mutex); mutex_lock(&mdsc->mutex);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment