Browse Source

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>

Anton Altaparmakov 20 years ago
parent
commit
d8ec785e0b
2 changed files with 5 additions and 2 deletions
  1. 3 0
      fs/ntfs/ChangeLog
  2. 2 2
      fs/ntfs/time.h

+ 3 - 0
fs/ntfs/ChangeLog

@@ -72,6 +72,9 @@ ToDo/Notes:
 	  runlist.  This allows us to find runlist elements with the runlist
 	  runlist.  This allows us to find runlist elements with the runlist
 	  lock already held without having to drop and reacquire it around the
 	  lock already held without having to drop and reacquire it around the
 	  call.  Adapt all callers.
 	  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.
 2.1.22 - Many bug and race fixes and error handling improvements.
 
 

+ 2 - 2
fs/ntfs/time.h

@@ -1,7 +1,7 @@
 /*
 /*
  * time.h - NTFS time conversion functions.  Part of the Linux-NTFS project.
  * 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
  * 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
  * 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;
 	struct timespec ts;
 
 
 	/* Subtract the NTFS time offset. */
 	/* 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
 	 * Convert the time to 1-second intervals and the remainder to
 	 * 1-nano-second intervals.
 	 * 1-nano-second intervals.