diff --git a/[refs] b/[refs]
index 375d41200919..75df7309a07c 100644
--- 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
index e48bd8235a8e..e37fe4deebd0 100644
--- 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);