---

yaml --- r: 83399 b: refs/heads/master c: ce88cc5 h: refs/heads/master i: 83397: 9de325e 83395: 4122cd2 83391: 12674d5 v: v3
git-mirror · Feb 6, 2008 · 04a1c03 · 04a1c03
1 parent cb65537
commit 04a1c03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 941e492bdb1239d2ca8f5736cdfd3ff83d00cb90
+refs/heads/master: ce88cc5ed80de746f5bd2d8242291c87e7b87f63
diff --git a/trunk/fs/smbfs/sock.c b/trunk/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);