---

yaml --- r: 188572 b: refs/heads/master c: 81b024e h: refs/heads/master v: v3
git-mirror · Oct 9, 2009 · 1da5ab7 · 1da5ab7
1 parent eeac914
commit 1da5ab7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 991abb6ecfc8edf9863aa6a3f43249e63f9d4d4e
+refs/heads/master: 81b024e70fed635a2cf5a4bf911db1649bb005f5
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
@@ -294,10 +294,7 @@ __lookup_request_ge(struct ceph_osd_client *osdc,
 
 
 /*
- * The messaging layer will reconnect to the osd as needed.  If the
- * session has dropped, the OSD will have dropped the session state,
- * and we'll get notified by the messaging layer.  If that happens, we
- * need to resubmit all requests for that osd.
+ * If the osd connection drops, we need to resubmit all requests.
  */
 static void osd_reset(struct ceph_connection *con)
 {
@@ -1301,7 +1298,7 @@ const static struct ceph_connection_operations osd_con_ops = {
 	.put = put_osd_con,
 	.dispatch = dispatch,
 	.alloc_msg = alloc_msg,
-	.peer_reset = osd_reset,
+	.fault = osd_reset,
 	.alloc_middle = ceph_alloc_middle,
 	.prepare_pages = prepare_pages,
 };