NTFS: Change time to u64 in time.h::ntfs2utc() as it otherwise generates a

      warning in the do_div() call on sparc32.  Thanks to Meelis Roos for the
      report and analysis of the warning.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 9d42393c16c05d22e5e6b29d238bd5c4457b33e6..0ef1cd3290966c942dafbb7f059cfc44a387218b 100644 (file)
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -72,6 +72,9 @@ ToDo/Notes:
          runlist.  This allows us to find runlist elements with the runlist
          lock already held without having to drop and reacquire it around the
          call.  Adapt all callers.
+       - Change time to u64 time.h::ntfs2utc() as it otherwise generates a
+         warning in the do_div() call on sparc32.  Thanks to Meelis Roos for
+         the report and analysis of the warning.
 
 2.1.22 - Many bug and race fixes and error handling improvements.
 

diff --git a/fs/ntfs/time.h b/fs/ntfs/time.h
index a09a51dabe4effa4b1eb617fccf752a6cdacfd20..01233989d5d14d69e78f9f73a794b9f9fb4ec906 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.