From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Nov 2010 19:25:58 +0000 (-0800)
Subject: Merge remote branch 'origin/testing' into unstable
X-Git-Tag: v0.24~183
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2c080b32fc3396023d831d7ec55c1e4f630784a;p=ceph.git

Merge remote branch 'origin/testing' into unstable
---

f2c080b32fc3396023d831d7ec55c1e4f630784a
diff --cc src/msg/tcp.cc
index f67db8507954,0e08a694de69..c1be7567fc08
--- a/src/msg/tcp.cc
+++ b/src/msg/tcp.cc
@@@ -7,10 -8,11 +8,11 @@@
  /******************
   * tcp crap
   */
 -
 -int tcp_read(int sd, char *buf, int len, int timeout) {
 +int tcp_read(int sd, char *buf, int len, int timeout) 
 +{
    if (sd < 0)
      return -1;
+ 
    struct pollfd pfd;
    pfd.fd = sd;
    pfd.events = POLLIN | POLLHUP | POLLRDHUP | POLLNVAL | POLLERR;