6 files changed, 34 insertions, 10 deletions

diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index d04d2f7448d9..85e3850bf2c9 100644
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -1,6 +1,8 @@
 Version 1.47
 ------------
 Fix oops in list_del during mount caused by unaligned string.
+Seek to SEEK_END forces check for update of file size for non-cached
+files.
 
 Version 1.46
 ------------
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 10c90294cd18..93ef09971d2f 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -511,7 +511,15 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin)
 {
         /* origin == SEEK_END => we must revalidate the cached file length */
         if (origin == SEEK_END) {
-                int retval = cifs_revalidate(file->f_path.dentry);
+                int retval;
+
+                /* some applications poll for the file length in this strange
+                   way so we must seek to end on non-oplocked files by
+                   setting the revalidate time to zero */
+                if(file->f_path.dentry->d_inode)                
+                        CIFS_I(file->f_path.dentry->d_inode)->time = 0;
+
+                retval = cifs_revalidate(file->f_path.dentry);
                 if (retval < 0)
                         return (loff_t)retval;
         }
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 8a49b2e77d37..e9dcf5ee29a2 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1146,7 +1146,7 @@ static int cifs_writepages(struct address_space *mapping,
         pgoff_t end;
         pgoff_t index;
         int range_whole = 0;
-        struct kvec iov[32];
+        struct kvec * iov;
         int len;
         int n_iov = 0;
         pgoff_t next;
@@ -1171,15 +1171,21 @@ static int cifs_writepages(struct address_space *mapping,
         if((cifs_sb->tcon->ses) && (cifs_sb->tcon->ses->server))
                 if(cifs_sb->tcon->ses->server->secMode &
                           (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
-                        if(!experimEnabled)
+                        if(!experimEnabled) 
                                 return generic_writepages(mapping, wbc);
 
+        iov = kmalloc(32 * sizeof(struct kvec), GFP_KERNEL);
+        if(iov == NULL)
+                return generic_writepages(mapping, wbc);
+
+
         /*
          * BB: Is this meaningful for a non-block-device file system?
          * If it is, we should test it again after we do I/O
          */
         if (wbc->nonblocking && bdi_write_congested(bdi)) {
                 wbc->encountered_congestion = 1;
+                kfree(iov);
                 return 0;
         }
 
@@ -1345,7 +1351,7 @@ retry:
                 mapping->writeback_index = index;
 
         FreeXid(xid);
-
+        kfree(iov);
         return rc;
 }
 
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 99dfb5337e31..782940be550f 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -156,9 +156,9 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                 tmp_inode->i_atime = cnvrtDosUnixTm(
                                 le16_to_cpu(pfindData->LastAccessDate),
                                 le16_to_cpu(pfindData->LastAccessTime));
-                tmp_inode->i_ctime = cnvrtDosUnixTm(
-                                le16_to_cpu(pfindData->LastWriteDate),
-                                le16_to_cpu(pfindData->LastWriteTime));
+                tmp_inode->i_ctime = cnvrtDosUnixTm(
+                                le16_to_cpu(pfindData->LastWriteDate),
+                                le16_to_cpu(pfindData->LastWriteTime));
                 AdjustForTZ(cifs_sb->tcon, tmp_inode);
                 attr = le16_to_cpu(pfindData->Attributes);
                 allocation_size = le32_to_cpu(pfindData->AllocationSize);
diff --git a/fs/cifs/smbdes.c b/fs/cifs/smbdes.c
index 7a1b2b961ec8..1b1daf63f062 100644
--- a/fs/cifs/smbdes.c
+++ b/fs/cifs/smbdes.c
@@ -196,7 +196,7 @@ dohash(char *out, char *in, char *key, int forw)
         char c[28];
         char d[28];
         char *cd;
-        char ki[16][48];
+        char (*ki)[48];
         char *pd1;
         char l[32], r[32];
         char *rl;
@@ -206,6 +206,12 @@ dohash(char *out, char *in, char *key, int forw)
         if(pk1 == NULL)
                 return;
 
+        ki = kmalloc(16*48, GFP_KERNEL);
+        if(ki == NULL) {
+                kfree(pk1);
+                return;
+        }
+
         cd = pk1 + 56;
         pd1= cd  + 56;
         rl = pd1 + 64;
@@ -243,6 +249,7 @@ dohash(char *out, char *in, char *key, int forw)
                 er = kmalloc(48+48+32+32+32, GFP_KERNEL);
                 if(er == NULL) {
                         kfree(pk1);
+                        kfree(ki);
                         return;
                 }
                 erk = er+48;
@@ -290,6 +297,7 @@ dohash(char *out, char *in, char *key, int forw)
 
         permute(out, rl, perm6, 64);
         kfree(pk1);
+        kfree(ki);
 }
 
 static void
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
index e1216364d191..d026b4f27757 100644
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
@@ -306,8 +306,8 @@ int                  ocfs2_journal_dirty_data(handle_t *handle,
  * for the dinode, one for the new block. */
 #define OCFS2_SIMPLE_DIR_EXTEND_CREDITS (2)
 
-/* file update (nlink, etc) + dir entry block */
-#define OCFS2_LINK_CREDITS  (OCFS2_INODE_UPDATE_CREDITS + 1)
+/* file update (nlink, etc) + directory mtime/ctime + dir entry block */
+#define OCFS2_LINK_CREDITS  (2*OCFS2_INODE_UPDATE_CREDITS + 1)
 
 /* inode + dir inode (if we unlink a dir), + dir entry block + orphan
  * dir inode link */