git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file
[safe/jmp/linux-2.6]
/
fs
/
smbfs
/
sock.c
diff --git
a/fs/smbfs/sock.c
b/fs/smbfs/sock.c
index
92ea6b2
..
e37fe4d
100644
(file)
--- a/
fs/smbfs/sock.c
+++ b/
fs/smbfs/sock.c
@@
-17,7
+17,6
@@
#include <linux/net.h>
#include <linux/mm.h>
#include <linux/netdevice.h>
#include <linux/net.h>
#include <linux/mm.h>
#include <linux/netdevice.h>
-#include <linux/smp_lock.h>
#include <linux/workqueue.h>
#include <net/scm.h>
#include <net/tcp_states.h>
#include <linux/workqueue.h>
#include <net/scm.h>
#include <net/tcp_states.h>
@@
-330,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 */
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);
result = kernel_recvmsg(sock, &msg, p, num, rlen, flags);