dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[CIFS] fix error in smb_send2 

smb_send2 exit logic was strange, and with the previous change
could cause us to fail large
smb writes when all of the smb was not sent as one chunk.

Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French 2008-10-30 20:15:22 +00:00
parent edf1ae4038
commit 61de800d33
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/cifs/cifssmb.c
View File

@ -1536,7 +1536,7 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon,
__u32 bytes_sent;
__u16 byte_count;
/* cFYI(1,("write at %lld %d bytes",offset,count));*/
/* cFYI(1, ("write at %lld %d bytes", offset, count));*/
if (tcon->ses == NULL)
return -ECONNABORTED;

2
fs/cifs/file.c
View File

@ -1824,7 +1824,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
pTcon = cifs_sb->tcon;
pagevec_init(&lru_pvec, 0);
cFYI(DBG2, ("rpages: num pages %d", num_pages));
cFYI(DBG2, ("rpages: num pages %d", num_pages));
for (i = 0; i < num_pages; ) {
unsigned contig_pages;
struct page *tmp_page;

7
fs/cifs/transport.c
View File

@ -290,8 +290,11 @@ smb_send2(struct TCP_Server_Info *server, struct kvec *iov, int n_vec,
if (rc < 0)
break;
if (rc >= total_len) {
WARN_ON(rc > total_len);
if (rc == total_len) {
total_len = 0;
break;
} else if (rc > total_len) {
cERROR(1, ("sent %d requested %d", rc, total_len));
break;
}
if (rc == 0) {