diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-19 13:46:53 -0500 |
| commit | 21d1ee8b375bcd180f1d6b8ccbb8d8f938596310 (patch) | |
| tree | 2e82b65c16a4aaa88eeb7dd9f47f2d1c418e77d0 /fs/ntfs/time.h | |
| parent | 3d9b1cdd2455017c6aa25bc2442092b81438981f (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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 a09a51dabe4..01233989d5d 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. |