patch-2.0.21-2.1.0 linux/fs/ncpfs/dir.c

• Lines: 26
• Date: Thu Sep 26 15:28:30 1996
• Orig file: lx2.0/v2.0.21/linux/fs/ncpfs/dir.c
• Orig date: Wed Sep 11 17:57:15 1996

diff -u --recursive --new-file lx2.0/v2.0.21/linux/fs/ncpfs/dir.c linux/fs/ncpfs/dir.c
@@ -10,6 +10,7 @@
 #include <linux/stat.h>
 #include <linux/kernel.h>
 #include <linux/malloc.h>
+#include <linux/vmalloc.h>
 #include <linux/mm.h>
 #include <linux/ncp_fs.h>
 #include <asm/segment.h>
@@ -1228,13 +1229,15 @@
 static int
 utc2local(int time)
 {
-        return time - sys_tz.tz_minuteswest*60;
+        return time - sys_tz.tz_minuteswest*60 +
+	    (sys_tz.tz_dsttime ? 3600 : 0);
 }
 
 static int
 local2utc(int 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). */