[DRBD-cvs] r1765 - in trunk: drbd user

[svn at svn.drbd.org]

Author: phil
Date: 2005-02-22 11:07:13 +0100 (Tue, 22 Feb 2005)
New Revision: 1765

Modified:
   trunk/drbd/drbd_main.c
   trunk/user/drbdmeta.c
Log:
Some fixes from LMB to make it work on i386 with 64 bit sector_t
and other misc stuff.


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2005-02-22 10:01:35 UTC (rev 1764)
+++ trunk/drbd/drbd_main.c	2005-02-22 10:07:13 UTC (rev 1765)
@@ -164,7 +164,7 @@
 
 STATIC unsigned int tl_hash_fn(drbd_dev *mdev, sector_t sector)
 {
-	return (sector>>HT_SHIFT) % mdev->tl_hash_s;
+	return (unsigned int)(sector>>HT_SHIFT) % mdev->tl_hash_s;
 }
 
 
@@ -367,7 +367,7 @@
 
 STATIC unsigned int ee_hash_fn(drbd_dev *mdev, sector_t sector)
 {
-	return (sector>>HT_SHIFT) % mdev->ee_hash_s;
+	return (unsigned int)(sector>>HT_SHIFT) % mdev->ee_hash_s;
 }
 
 STATIC int overlaps(sector_t s1, int l1, sector_t s2, int l2)

Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2005-02-22 10:01:35 UTC (rev 1764)
+++ trunk/user/drbdmeta.c	2005-02-22 10:07:13 UTC (rev 1765)
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <linux/fs.h>		/* for BLKGETSIZE64 */
+#include <sys/mount.h>         /* for BLKGETSIZE64 */
 #include <linux/drbd.h>		/* only use DRBD_MAGIC from here! */
 
 #include "drbdtool_common.h"