summaryrefslogtreecommitdiffstats
path: root/fs/isofs
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-18 00:24:27 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-18 00:24:27 +0000
commitb9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch)
tree707b53ec64e740a7da87d5f36485e3cd9b1c794e /fs/isofs
parentb3ac367c7a3e6047abe74817db27e34e759f279f (diff)
Merge with Linux 2.3.41.
Diffstat (limited to 'fs/isofs')
-rw-r--r--fs/isofs/util.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/isofs/util.c b/fs/isofs/util.c
index a8962fc76..12cd2d304 100644
--- a/fs/isofs/util.c
+++ b/fs/isofs/util.c
@@ -114,7 +114,6 @@ int iso_date(char * p, int flag)
crtime = 0;
} else {
int monlen[12] = {31,28,31,30,31,30,31,31,30,31,30,31};
- extern struct timezone sys_tz;
days = year * 365;
if (year > 2)
@@ -126,8 +125,6 @@ int iso_date(char * p, int flag)
days += day - 1;
crtime = ((((days * 24) + hour) * 60 + minute) * 60)
+ second;
- if (sys_tz.tz_dsttime)
- crtime -= 3600;
/* sign extend */
if (tz & 0x80)
@@ -149,7 +146,7 @@ int iso_date(char * p, int flag)
* NOTE: mkisofs in versions prior to mkisofs-1.10 had
* the sign wrong on the timezone offset. This has now
* been corrected there too, but if you are getting screwy
- * results this may be the explaination. If enough people
+ * results this may be the explanation. If enough people
* complain, a user configuration option could be added
* to add the timezone offset in with the wrong sign
* for 'compatibility' with older discs, but I cannot see how