From c6a4a78602afceb329a2e3c131b1bba319b2ab2e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 18 Oct 2011 12:41:35 +0300 Subject: [PATCH] --- yaml --- r: 269959 b: refs/heads/master c: 7748dd6eab8e13f974d4664395e76afffacda04b h: refs/heads/master i: 269957: f6fc921ea74d3370b052bfa4761a9771fe0c6531 269955: 4e7b9f346153863b5dabdb36ebcfe046c76a00fd 269951: 9c242cf4bafcbcbaaab9dd70f1cf280c57e1f365 v: v3 --- [refs] | 2 +- trunk/fs/cifs/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d0815c205e3..ff405df902cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5ff376966c079bd2f078524eff11b0c63cc2507 +refs/heads/master: 7748dd6eab8e13f974d4664395e76afffacda04b diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c index 7f84ece116d0..852d1f39adae 100644 --- a/trunk/fs/cifs/file.c +++ b/trunk/fs/cifs/file.c @@ -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;