[LV-k25-commit] kernel-2.5/fs/ods2 util.c,1.9,1.10

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs/ods2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30608

Modified Files:
	util.c 
Log Message:
- Remove two real bugs:
	- Double type at variable declaration.
	- Missing constant suffix (would lead to a u64 cutted down to
	  a u32 ...)


Index: util.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/ods2/util.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- util.c	22 Sep 2004 09:13:39 -0000	1.9
+++ util.c	23 Sep 2004 02:05:11 -0000	1.10
@@ -23,7 +23,7 @@
 u64
 div64 (u64 a, u32 b0) {
 	u32 a1, a2;
-	u32 long res; /* FIXME: What?! */
+	u32 res;
 
 	a1 = ((u32 *)&a)[0];
 	a2 = ((u32 *)&a)[1];
@@ -216,7 +216,7 @@
 vms2unix_sec (u16 *vms_timestamp)
 {
 	printk (KERN_ERR "%s probably isn't yet correct, because it uses 2.4.x style i_[mca]time!\n", __FUNCTION__);
-	return (u64)div64((le64_to_cpu(*(u64 *)&(vms_timestamp)) - 0x007c953d63a19980L) >> 7, 78125) + 2;
+	return (u64)div64((le64_to_cpu(*(u64 *)&(vms_timestamp)) - 0x007c953d63a19980ull) >> 7, 78125) + 2;
 }
 
 long