---

yaml --- r: 188709 b: refs/heads/master c: 153a008 h: refs/heads/master i: 188707: b4ab6d5 v: v3
git-mirror · Feb 15, 2010 · 5cbc22c · 5cbc22c
1 parent 7316b56
commit 5cbc22c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c5d1a49e5e88ee831117f4b2375829933ad15da
+refs/heads/master: 153a008bf7915ea9127341409170cb197d111282
diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
@@ -369,7 +369,6 @@ static void osd_reset(struct ceph_connection *con)
 		return;
 	dout("osd_reset osd%d\n", osd->o_osd);
 	osdc = osd->o_osdc;
-	osd->o_incarnation++;
 	down_read(&osdc->map_sem);
 	kick_requests(osdc, osd);
 	up_read(&osdc->map_sem);
@@ -921,7 +920,9 @@ static void kick_requests(struct ceph_osd_client *osdc,
 
 	dout("kick_requests osd%d\n", kickosd ? kickosd->o_osd : -1);
 	mutex_lock(&osdc->request_mutex);
-	if (!kickosd) {
+	if (kickosd) {
+		__reset_osd(osdc, kickosd);
+	} else {
 		for (p = rb_first(&osdc->osds); p; p = n) {
 			struct ceph_osd *osd =
 				rb_entry(p, struct ceph_osd, o_node);