summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-21 14:28:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-21 14:28:01 -0700
commit2bafc7a275436da4a1ece4ecfcbacb82a0560efb (patch)
tree097f820c6cad0a437255f0207e8ac6befd9fac76
parent57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f (diff)
parent2cebaa58b7de775386732bbd6cd11c3f5b73faf0 (diff)
downloadlinux-2bafc7a275436da4a1ece4ecfcbacb82a0560efb.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: CIFS: Fix wrong length in cifs_iovec_read
-rw-r--r--fs/cifs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index bb71471a4d9d..a9b4a24f2a16 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1737,7 +1737,7 @@ cifs_iovec_read(struct file *file, const struct iovec *iov,
io_parms.pid = pid;
io_parms.tcon = pTcon;
io_parms.offset = *poffset;
- io_parms.length = len;
+ io_parms.length = cur_len;
rc = CIFSSMBRead(xid, &io_parms, &bytes_read,
&read_data, &buf_type);
pSMBr = (struct smb_com_read_rsp *)read_data;