X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fsmbfs%2Fsock.c;h=e37fe4deebd0ebe5050e1fbab7c9ef7cbc2ad4db;hb=197cd65accc6a274dabcd81f4811ba5d9a4856df;hp=e48bd8235a8e39fd81231cb091ee570569d37b09;hpb=393bfca19ecdce60a8d9a4d2577cac11ca924a25;p=linux-2.6

diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c
index e48bd8235a..e37fe4deeb 100644
--- a/fs/smbfs/sock.c
+++ b/fs/smbfs/sock.c
@@ -329,9 +329,8 @@ smb_receive(struct smb_sb_info *server, struct smb_request *req)
 	msg.msg_control = NULL;
 
 	/* Dont repeat bytes and count available bufferspace */
-	rlen = smb_move_iov(&p, &num, iov, req->rq_bytes_recvd);
-	if (req->rq_rlen < rlen)
-		rlen = req->rq_rlen;
+	rlen = min_t(int, smb_move_iov(&p, &num, iov, req->rq_bytes_recvd),
+			(req->rq_rlen - req->rq_bytes_recvd));
 
 	result = kernel_recvmsg(sock, &msg, p, num, rlen, flags);