Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / ntfs / time.h

diff --git a/fs/ntfs/time.h b/fs/ntfs/time.h
index a09a51d..0123398 100644 (file)
--- 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.