diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 17:28:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-21 17:28:01 -0400 |
| commit | 2bafc7a275436da4a1ece4ecfcbacb82a0560efb (patch) | |
| tree | 097f820c6cad0a437255f0207e8ac6befd9fac76 /fs | |
| parent | 57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f (diff) | |
| parent | 2cebaa58b7de775386732bbd6cd11c3f5b73faf0 (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/file.c | 2 |
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, | |||
| 1737 | io_parms.pid = pid; | 1737 | io_parms.pid = pid; |
| 1738 | io_parms.tcon = pTcon; | 1738 | io_parms.tcon = pTcon; |
| 1739 | io_parms.offset = *poffset; | 1739 | io_parms.offset = *poffset; |
| 1740 | io_parms.length = len; | 1740 | io_parms.length = cur_len; |
| 1741 | rc = CIFSSMBRead(xid, &io_parms, &bytes_read, | 1741 | rc = CIFSSMBRead(xid, &io_parms, &bytes_read, |
| 1742 | &read_data, &buf_type); | 1742 | &read_data, &buf_type); |
| 1743 | pSMBr = (struct smb_com_read_rsp *)read_data; | 1743 | pSMBr = (struct smb_com_read_rsp *)read_data; |