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

[svn at svn.drbd.org]

Author: phil
Date: 2004-09-01 20:38:23 +0200 (Wed, 01 Sep 2004)
New Revision: 1527

Modified:
   trunk/drbd/drbd_int.h
   trunk/user/drbdsetup.c
Log:
Fixing compiler-warnings.


Modified: trunk/drbd/drbd_int.h
===================================================================
--- trunk/drbd/drbd_int.h	2004-09-01 18:35:00 UTC (rev 1526)
+++ trunk/drbd/drbd_int.h	2004-09-01 18:38:23 UTC (rev 1527)
@@ -962,7 +962,7 @@
  */
 
 #define DRBD_MAX_SECTORS \
-          ( (MD_RESERVED_SIZE*2 - MD_BM_OFFSET) * (1<<BM_EXT_SIZE_B-9) )
+          ( (MD_RESERVED_SIZE*2 - MD_BM_OFFSET) * (1<<(BM_EXT_SIZE_B-9)) )
 
 extern int  drbd_bm_init      (drbd_dev *mdev);
 extern int  drbd_bm_resize    (drbd_dev *mdev, sector_t sectors);

Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2004-09-01 18:35:00 UTC (rev 1526)
+++ trunk/user/drbdsetup.c	2004-09-01 18:38:23 UTC (rev 1527)
@@ -1203,7 +1203,8 @@
   }
 
   printf("Disk options:\n");
-  if( cn.disk_size_user ) printf(" size = %d KB\n",cn.disk_size_user);
+  if( cn.disk_size_user ) printf(" size = %lu KB\n",
+				 (unsigned long)cn.disk_size_user);
   if( cn.on_io_error != DEF_ON_IO_ERROR) {
     printf(" on-io-error = %s\n",eh_names[cn.on_io_error]);
   }