diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 14:47:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 14:47:51 -0400 |
| commit | af6ea9ca23504fe620412826a420dca9c43a8bf6 (patch) | |
| tree | 19bebbeb442a8d08ad29f2056665b5fdd9bf1478 /fs/ntfs/time.h | |
| parent | 1fa4aad496b9c96fcde6c8f905a43ae6733e5a79 (diff) | |
| parent | c514720716c7b109ff980f8b3cb93f9af872c91c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * time.h - NTFS time conversion functions. Part of the Linux-NTFS project. | 2 | * time.h - NTFS time conversion functions. Part of the Linux-NTFS project. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2004 Anton Altaparmakov | 4 | * Copyright (c) 2001-2005 Anton Altaparmakov |
| 5 | * | 5 | * |
| 6 | * This program/include file is free software; you can redistribute it and/or | 6 | * This program/include file is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License as published | 7 | * 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) | |||
| 87 | struct timespec ts; | 87 | struct timespec ts; |
| 88 | 88 | ||
| 89 | /* Subtract the NTFS time offset. */ | 89 | /* Subtract the NTFS time offset. */ |
| 90 | s64 t = sle64_to_cpu(time) - NTFS_TIME_OFFSET; | 90 | u64 t = (u64)(sle64_to_cpu(time) - NTFS_TIME_OFFSET); |
| 91 | /* | 91 | /* |
| 92 | * Convert the time to 1-second intervals and the remainder to | 92 | * Convert the time to 1-second intervals and the remainder to |
| 93 | * 1-nano-second intervals. | 93 | * 1-nano-second intervals. |