From: Sage Weil <sage@newdream.net>
Date: Wed, 21 Apr 2010 18:09:38 +0000 (-0700)
Subject: ceph: osdtimeout=0 for now timeout
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f26e681d52fcc4778d8c604ef047487ca9f3df95;p=deliverable%2Flinux.git

ceph: osdtimeout=0 for now timeout

Allow the osd reset timeout to be disabled.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index b81e6f97010e..97a3a57fe8cd 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);