Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269959
b: refs/heads/master
c: 7748dd6
h: refs/heads/master
i:
  269957: f6fc921
  269955: 4e7b9f3
  269951: 9c242cf
v: v3
  • Loading branch information
Dan Carpenter authored and Steve French committed Oct 18, 2011
1 parent 79bc128 commit c6a4a78
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5ff376966c079bd2f078524eff11b0c63cc2507
refs/heads/master: 7748dd6eab8e13f974d4664395e76afffacda04b
4 changes: 2 additions & 2 deletions trunk/fs/cifs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1904,13 +1904,13 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
for (total_read = 0, current_offset = read_data;
read_size > total_read;
total_read += bytes_read, current_offset += bytes_read) {
current_read_size = min_t(const int, read_size - total_read,
current_read_size = min_t(uint, read_size - total_read,
cifs_sb->rsize);
/* For windows me and 9x we do not want to request more
than it negotiated since it will refuse the read then */
if ((pTcon->ses) &&
!(pTcon->ses->capabilities & CAP_LARGE_FILES)) {
current_read_size = min_t(const int, current_read_size,
current_read_size = min_t(uint, current_read_size,
CIFSMaxBufSize);
}
rc = -EAGAIN;
Expand Down

0 comments on commit c6a4a78

Please sign in to comment.