diff --git a/[refs] b/[refs]
index 767ddd87f653..36bbc78b03dd 100644
--- 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
index 63e1252d3af5..6e2f67816f61 100644
--- 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);