From e3f92326b682e09d531ac1e6ce4e886eb6f9ca3f Mon Sep 17 00:00:00 2001 From: Steve French Date: Wed, 11 Oct 2006 18:49:24 +0000 Subject: [PATCH] --- yaml --- r: 39532 b: refs/heads/master c: 70903ca004fef17b0f6483714baefdb2f6ecceb0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/netmisc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e383c5e73be7..b29b8b3ed424 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 438dd926260f11ff01fc3441ac6dd4c412d20ea4 +refs/heads/master: 70903ca004fef17b0f6483714baefdb2f6ecceb0 diff --git a/trunk/fs/cifs/netmisc.c b/trunk/fs/cifs/netmisc.c index 32562d199552..3adbd128e08e 100644 --- a/trunk/fs/cifs/netmisc.c +++ b/trunk/fs/cifs/netmisc.c @@ -956,7 +956,8 @@ struct timespec cnvrtDosUnixTm(__u16 date, __u16 time) days = days - 1; /* do not count leap year for the year 2100 */ /* adjust for leap year where we are still before leap day */ - days -= ((year & 0x03) == 0) && (month < 2 ? 1 : 0); + if(year != 120) + days -= ((year & 0x03) == 0) && (month < 2 ? 1 : 0); sec += 24 * 60 * 60 * days; ts.tv_sec = sec;