4 files changed, 23 insertions, 9 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 88f60aa52058..e488603fb1e7 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1785,7 +1785,16 @@ 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_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
+                           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 */
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 77c990f0cb98..d17c97d07c80 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1190,7 +1190,6 @@ retry:
                                         /* BB what if continued retry is
                                            requested via mount flags? */
                                         set_bit(AS_EIO, &mapping->flags);
-                                        SetPageError(page);
                                 } else {
                                         cifs_stats_bytes_written(cifs_sb->tcon,
                                                                  bytes_written);
@@ -1198,6 +1197,13 @@ retry:
                         }
                         for (i = 0; i < n_iov; i++) {
                                 page = pvec.pages[first + i];
+                                /* Should we also set page error on
+                                success rc but too little data written? */
+                                /* BB investigate retry logic on temporary
+                                server crash cases and how recovery works
+                                when page marked as error */ 
+                                if(rc)
+                                        SetPageError(page);
                                 kunmap(page);
                                 unlock_page(page);
                                 page_cache_release(page);
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 7b98792150ea..b12cb8a7da7c 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -498,7 +498,6 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
                         else
                                 *pRespBufType = CIFS_SMALL_BUFFER;
                         iov[0].iov_len = receive_len + 4;
-                        iov[1].iov_len = 0;
 
                         dump_smb(midQ->resp_buf, 80);
                         /* convert the length into a more usable form */
diff --git a/fs/compat.c b/fs/compat.c
index cc58a20df57a..70c5af4cc270 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -73,17 +73,17 @@ asmlinkage long compat_sys_utime(char __user *filename, struct compat_utimbuf __
         return do_utimes(AT_FDCWD, filename, t ? tv : NULL);
 }
 
-asmlinkage long compat_sys_futimesat(int dfd, char __user *filename, struct compat_timeval __user *t)
+asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, struct compat_timeval __user *t)
 {
         struct timeval tv[2];
 
-        if (t) { 
+        if (t) {
                 if (get_user(tv[0].tv_sec, &t[0].tv_sec) ||
                     get_user(tv[0].tv_usec, &t[0].tv_usec) ||
                     get_user(tv[1].tv_sec, &t[1].tv_sec) ||
                     get_user(tv[1].tv_usec, &t[1].tv_usec))
-                        return -EFAULT; 
-        } 
+                        return -EFAULT;
+        }
         return do_utimes(dfd, filename, t ? tv : NULL);
 }
 
@@ -114,7 +114,7 @@ asmlinkage long compat_sys_newlstat(char __user * filename,
         return error;
 }
 
-asmlinkage long compat_sys_newfstatat(int dfd, char __user *filename,
+asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename,
                 struct compat_stat __user *statbuf, int flag)
 {
         struct kstat stat;
@@ -1326,7 +1326,7 @@ compat_sys_open(const char __user *filename, int flags, int mode)
  * O_LARGEFILE flag.
  */
 asmlinkage long
-compat_sys_openat(int dfd, const char __user *filename, int flags, int mode)
+compat_sys_openat(unsigned int dfd, const char __user *filename, int flags, int mode)
 {
         return do_sys_open(dfd, filename, flags, mode);
 }