summaryrefslogtreecommitdiff
path: root/fs/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-04-21 11:09:38 -0700
committerSage Weil <sage@newdream.net>2010-05-17 15:25:22 -0700
commitf26e681d52fcc4778d8c604ef047487ca9f3df95 (patch)
tree8ecf2e821aabda4c062debf469e3870f8ec13bf7 /fs/ceph
parent0d509c949a4d3f21943bd93863a2e6c2f0d0c004 (diff)
ceph: osdtimeout=0 for now timeout
Allow the osd reset timeout to be disabled. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/osd_client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index b81e6f97010..97a3a57fe8c 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -715,7 +715,7 @@ static void handle_timeout(struct work_struct *work)
* should mark the osd as failed and we should find out about
* it from an updated osd map.
*/
- while (!list_empty(&osdc->req_lru)) {
+ while (timeout && !list_empty(&osdc->req_lru)) {
req = list_entry(osdc->req_lru.next, struct ceph_osd_request,
r_req_lru_item);