1 files changed, 23 insertions, 4 deletions

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index b27b34537bf2..b5b0a2a41bef 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -106,6 +106,17 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
         return rc;
 }
 
+static void AdjustForTZ(struct cifsTconInfo * tcon, struct inode * inode)
+{
+        if((tcon) && (tcon->ses) && (tcon->ses->server)) {
+                inode->i_ctime.tv_sec += tcon->ses->server->timeAdj;
+                inode->i_mtime.tv_sec += tcon->ses->server->timeAdj;
+                inode->i_atime.tv_sec += tcon->ses->server->timeAdj;
+        }
+        return;
+}
+
+
 static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                 char * buf, int *pobject_type, int isNewInode)
 {
@@ -135,16 +146,23 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                 tmp_inode->i_ctime =
                       cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime));
         } else { /* legacy, OS2 and DOS style */
+/*              struct timespec ts;*/
                 FIND_FILE_STANDARD_INFO * pfindData = 
                         (FIND_FILE_STANDARD_INFO *)buf;
 
+                tmp_inode->i_mtime = cnvrtDosUnixTm(
+                                le16_to_cpu(pfindData->LastWriteDate),
+                                le16_to_cpu(pfindData->LastWriteTime));
+                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));
+                AdjustForTZ(cifs_sb->tcon, tmp_inode);
                 attr = le16_to_cpu(pfindData->Attributes);
                 allocation_size = le32_to_cpu(pfindData->AllocationSize);
                 end_of_file = le32_to_cpu(pfindData->DataSize);
-                tmp_inode->i_atime = CURRENT_TIME;
-                /* tmp_inode->i_mtime =  BB FIXME - add dos time handling
-                tmp_inode->i_ctime = 0;   BB FIXME */
-
         }
 
         /* Linux can not store file creation time unfortunately so ignore it */
@@ -938,6 +956,7 @@ static int cifs_save_resume_key(const char *current_entry,
                 filename = &pFindData->FileName[0];
                 /* one byte length, no name conversion */
                 len = (unsigned int)pFindData->FileNameLength;
+                cifsFile->srch_inf.resume_key = pFindData->ResumeKey;
         } else {
                 cFYI(1,("Unknown findfirst level %d",level));
                 return -EINVAL;