patch-2.0.31 linux/fs/ncpfs/dir.c

• Lines: 32
• Date: Thu Aug 14 21:02:34 1997
• Orig file: v2.0.30/linux/fs/ncpfs/dir.c
• Orig date: Sat Nov 30 02:21:21 1996

diff -u --recursive --new-file v2.0.30/linux/fs/ncpfs/dir.c linux/fs/ncpfs/dir.c
@@ -1067,7 +1067,6 @@
 	}
         if (ncp_find_dir_inode(dir, name) != NULL)
 	{
-		iput(dir);
                 error = -EBUSY;
         }
 	else
@@ -1115,7 +1114,6 @@
 	}
         if (ncp_find_dir_inode(dir, name) != NULL)
 	{
-		iput(dir);
                 error = -EBUSY;
         }
 	else
@@ -1228,13 +1226,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). */