---

yaml --- r: 320329 b: refs/heads/master c: 3a140a0 h: refs/heads/master i: 320327: ad625be v: v3
git-mirror · Jul 31, 2012 · 6090f7e · 6090f7e
1 parent 69bad52
commit 6090f7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 546f04ef716dd49521774653d8b032a7d64c05d9
+refs/heads/master: 3a140a0d5c4b9e35373b016e41dfc85f1e526bdb
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -2287,14 +2287,18 @@ static void con_work(struct work_struct *work)
 	ret = try_read(con);
 	if (ret == -EAGAIN)
 		goto restart;
-	if (ret < 0)
+	if (ret < 0) {
+		con->error_msg = "socket error on read";
 		goto fault;
+	}
 
 	ret = try_write(con);
 	if (ret == -EAGAIN)
 		goto restart;
-	if (ret < 0)
+	if (ret < 0) {
+		con->error_msg = "socket error on write";
 		goto fault;
+	}
 
 done:
 	mutex_unlock(&con->mutex);