[DRBD-cvs] r1771 - trunk/user

[www-data]

Author: phil
Date: 2005-03-21 21:10:22 +0100 (Mon, 21 Mar 2005)
New Revision: 1771

Modified:
   trunk/user/drbdadm_main.c
   trunk/user/drbdmeta.c
Log:
Two micro fixes...


Modified: trunk/user/drbdadm_main.c
===================================================================
--- trunk/user/drbdadm_main.c	2005-03-21 20:02:52 UTC (rev 1770)
+++ trunk/user/drbdadm_main.c	2005-03-21 20:10:22 UTC (rev 1771)
@@ -410,18 +410,6 @@
   free_options(common->handlers);
 }
 
-static struct d_option* new_opt(char* name,char* value)
-{
-  struct d_option* cn = malloc(sizeof(struct d_option));
-
-  /* fprintf(stderr,"%s:%d: %s = %s\n",config_file,line,name,value); */
-  cn->name=name;
-  cn->value=value;
-  cn->mentioned=0;
-
-  return cn;
-}
-
 static void expand_opts(struct d_option* co, struct d_option** opts)
 {
   struct d_option* no;

Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2005-03-21 20:02:52 UTC (rev 1770)
+++ trunk/user/drbdmeta.c	2005-03-21 20:10:22 UTC (rev 1771)
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <sys/mount.h>         /* for BLKGETSIZE64 */
+#include <linux/fs.h>           /* for BLKGETSIZE64 */
 #include <linux/drbd.h>		/* only use DRBD_MAGIC from here! */
 
 #include "drbdtool_common.h"