From: Andy Grover <andy.grover@oracle.com>
Date: Mon, 14 Dec 2009 22:38:56 +0000 (-0800)
Subject: RDS: sendmsg() should check sndtimeo, not rcvtimeo
X-Git-Tag: v4.1.12-92~319^2^2~2^2~96
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a189e0861e13e921364255fc4bd9b2ccd536cbe6;p=users%2Fjedix%2Flinux-maple.git

RDS: sendmsg() should check sndtimeo, not rcvtimeo

Most likely cut n paste error - sendmsg() was checking sock_rcvtimeo.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
---

diff --git a/net/rds/send.c b/net/rds/send.c
index e9651aede45c..b155b07b477f 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -816,7 +816,7 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
 	int ret = 0;
 	int queued = 0, allocated_mr = 0;
 	int nonblock = msg->msg_flags & MSG_DONTWAIT;
-	long timeo = sock_rcvtimeo(sk, nonblock);
+	long timeo = sock_sndtimeo(sk, nonblock);
 
 	/* Mirror Linux UDP mirror of BSD error message compatibility */
 	/* XXX: Perhaps MSG_MORE someday */