Merge remote branch 'sf/branch-allea' into branch-allea

[netatalk.git] / etc / cnid_dbd / cmd_dbd.h

diff --git a/etc/cnid_dbd/cmd_dbd.h b/etc/cnid_dbd/cmd_dbd.h
index 425fb400cd3f4d1e13a1b671b249278c1eba0c0a..e94c861873bdd2acdb9f77041211838d5ab22555 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd.h
+++ b/etc/cnid_dbd/cmd_dbd.h
@@ -4,7 +4,7 @@
 #include <signal.h>
 #include <limits.h>
 
-#include <atalk/volinfo.h>
+#include <atalk/netatalk_conf.h>
 #include "dbif.h"
 
 enum logtype {LOGSTD, LOGDEBUG};
@@ -25,10 +25,11 @@ typedef unsigned int dbd_flags_t;
         (strcmp(a,c) b 0)
 
 extern int nocniddb; /* Dont open CNID database, only scan filesystem */
+extern int db_locked; /* have we got the fcntl lock on lockfd ? */
 extern volatile sig_atomic_t alarmed;
 
 extern void dbd_log(enum logtype lt, char *fmt, ...);
-extern int cmd_dbd_scanvol(DBD *dbd, struct volinfo *volinfo, dbd_flags_t flags);
+extern int cmd_dbd_scanvol(DBD *dbd, struct vol *vol, dbd_flags_t flags);
 
 /*
   Functions for querying the database which couldn't be reused from the existing