From 52ed320537c460ed9cf3850999465060357c91c8 Mon Sep 17 00:00:00 2001 From: Steve French Date: Fri, 27 Jan 2006 18:36:11 -0800 Subject: [PATCH] --- yaml --- r: 19484 b: refs/heads/master c: 1877c9ea66a29563987f22d0a86c66f438a87ce2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/connect.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 676bb1c3490e..d61bd4b688b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb9bdaa3f3b9d30d09bcad47037216aa39639b8e +refs/heads/master: 1877c9ea66a29563987f22d0a86c66f438a87ce2 diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index eae306fa24b2..e488603fb1e7 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1786,7 +1786,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, cifs_sb->wsize = volume_info.wsize; else cifs_sb->wsize = - min(PAGEVEC_SIZE * PAGE_CACHE_SIZE, 127*1024); + min_t(const int, 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