patch-2.0.36 linux/fs/smbfs/proc.c

• Lines: 39
• Date: Sun Nov 15 10:33:14 1998
• Orig file: v2.0.35/linux/fs/smbfs/proc.c
• Orig date: Mon Jul 13 13:46:38 1998

diff -u --recursive --new-file v2.0.35/linux/fs/smbfs/proc.c linux/fs/smbfs/proc.c
@@ -205,13 +205,13 @@
 static int
 utc2local(int time)
 {
-	return time - sys_tz.tz_minuteswest * 60;
+	return time - sys_tz.tz_minuteswest * 60 + sys_tz.tz_dsttime * 3600;
 }
 
 static int
 local2utc(int time)
 {
-	return time + sys_tz.tz_minuteswest * 60;
+	return time + sys_tz.tz_minuteswest * 60 - sys_tz.tz_dsttime * 3600;
 }
 
 /* Convert a MS-DOS time/date pair to a UNIX date (seconds since 1 1 70). */
@@ -1221,15 +1221,15 @@
 			WSET(param, 10, 8 + 4 + 2);	/* resume required +
 							   close on end +
 							   continue */
+		}
 #ifdef CONFIG_SMB_WIN95
-			/* Windows 95 is not able to deliver answers
-			   to FIND_NEXT fast enough, so sleep 0.2 seconds */
-			current->timeout = jiffies + HZ / 5;
-			current->state = TASK_INTERRUPTIBLE;
-			schedule();
-			current->timeout = 0;
+		/* Windows 95 is not able to deliver answers
+		   to FIND_NEXT fast enough, so sleep 0.2 seconds */
+		current->timeout = jiffies + HZ / 5;
+		current->state = TASK_INTERRUPTIBLE;
+		schedule();
+		current->timeout = 0;
 #endif
-		}
 
 		result = smb_trans2_request(server, command,
 					    0, NULL, 12 + mask_len + 2, param,