---

yaml --- r: 12050 b: refs/heads/master c: f9f5c81 h: refs/heads/master v: v3
git-mirror · Sep 16, 2005 · bb0b8c1 · bb0b8c1
1 parent 95db7d7
commit bb0b8c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eafe87012159a40a1e7151cc576e99a22aea2f0b
+refs/heads/master: f9f5c81769f88bccd177423a30a7d30461754c39
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
@@ -1278,6 +1278,13 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
 	     total_read += bytes_read, current_offset += bytes_read) {
 		current_read_size = min_t(const int, 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,
+					pTcon->ses->server->maxBuf - 128);
+		}
 		rc = -EAGAIN;
 		while (rc == -EAGAIN) {
 			if ((open_file->invalidHandle) &&