Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
OpenBMC Firmware
talos-obmc-linux
Commits
e2885f06
Commit
e2885f06
authored
15 years ago
by
Sage Weil
Browse files
Options
Download
Email Patches
Plain Diff
ceph: make mds ops interruptible
Signed-off-by:
Sage Weil
<
sage@newdream.net
>
parent
cf3e5c40
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
fs/ceph/mds_client.c
fs/ceph/mds_client.c
+9
-6
No files found.
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);
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment