diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-07-19 14:36:00 -0700 |
| commit | 076fb01e8238b7e5d68ba0d729c0ff7716d1d8ec (patch) | |
| tree | abcaefe016870427ed289748cb0b936575d60593 /fs/ntfs/time.h | |
| parent | 4c48b0d3d1c7ff9f13134b30e41c6e81a92027bf (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/ntfs/time.h')
| -rw-r--r-- | fs/ntfs/time.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/time.h b/fs/ntfs/time.h index a09a51dabe4e..01233989d5d1 100644 --- a/fs/ntfs/time.h +++ b/fs/ntfs/time.h @@ -1,7 +1,7 @@ /* * time.h - NTFS time conversion functions. Part of the Linux-NTFS project. * - * Copyright (c) 2001-2004 Anton Altaparmakov + * Copyright (c) 2001-2005 Anton Altaparmakov * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -87,7 +87,7 @@ static inline struct timespec ntfs2utc(const sle64 time) struct timespec ts; /* Subtract the NTFS time offset. */ - s64 t = sle64_to_cpu(time) - NTFS_TIME_OFFSET; + u64 t = (u64)(sle64_to_cpu(time) - NTFS_TIME_OFFSET); /* * Convert the time to 1-second intervals and the remainder to * 1-nano-second intervals. |