summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-01-24 20:26:48 -0800
committerSteve French <sfrench@us.ibm.com>2006-01-24 20:26:48 -0800
commit17cbbafe8e82bde4258e407ce043b61f4f9a350f (patch)
tree1a79ce7f9febeef296cb6b43144af3f777f83f39 /fs/cifs
parent4c8af5254e741983e141e10002e01abba87f8419 (diff)
downloadop-kernel-dev-17cbbafe8e82bde4258e407ce043b61f4f9a350f.zip
op-kernel-dev-17cbbafe8e82bde4258e407ce043b61f4f9a350f.tar.gz
[CIFS] Make cifs default wsize match what we actually want to send (52K
typically - header + 13 pages). Forgetting to set wsize on the mount command costs more than 10% on large write (can be much more) so this makes a saner default. We still shrink this default smaller if server can not support it. Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/connect.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 88f60aa..eae306f 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1785,7 +1785,15 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
} else if(volume_info.wsize)
cifs_sb->wsize = volume_info.wsize;
else
- cifs_sb->wsize = CIFSMaxBufSize; /* default */
+ cifs_sb->wsize =
+ min(PAGEVEC_SIZE * PAGE_CACHE_SIZE, 127*1024);
+ /* old default of CIFSMaxBufSize was too small now
+ that SMB Write2 can send multiple pages in kvec.
+ RFC1001 does not describe what happens when frame
+ bigger than 128K is sent so use that as max in
+ conjunction with 52K kvec constraint on arch with 4K
+ page size */
+
if(cifs_sb->rsize < PAGE_CACHE_SIZE) {
cifs_sb->rsize = PAGE_CACHE_SIZE;
/* Windows ME does this */
OpenPOWER on IntegriCloud