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

Next file: linux/fs/super.c
Previous file: linux/fs/read_write.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.115/linux/fs/smbfs/proc.c linux/fs/smbfs/proc.c
@@ -179,13 +179,13 @@
 static time_t
 utc2local(time_t time)
 {
-	return time - sys_tz.tz_minuteswest * 60;
+	return time - sys_tz.tz_minuteswest * 60 - (sys_tz.tz_dsttime ? 3600 :0);
 }
 
 static time_t
 local2utc(time_t time)
 {
-	return time + sys_tz.tz_minuteswest * 60;
+	return time + sys_tz.tz_minuteswest * 60 + (sys_tz.tz_dsttime ? 3600 : 0);
 }
 
 /* Convert a MS-DOS time/date pair to a UNIX date (seconds since 1 1 70). */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov