Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / alock.h

diff --git a/servers/slapd/alock.h b/servers/slapd/alock.h
index 49efcbeea0cc92f02050787311b3a7e5f87e0e00..4492913f8c6cd25aedf89449e3b6059c230eae10 100644 (file)
--- a/servers/slapd/alock.h
+++ b/servers/slapd/alock.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2006 The OpenLDAP Foundation.
+ * Copyright 2005-2012 The OpenLDAP Foundation.
  * Portions Copyright 2004-2005 Symas Corporation.
  * All rights reserved.
  *
@@ -15,7 +15,7 @@
  * <http://www.OpenLDAP.org/license.html>.
  */
 /* ACKNOWLEDGEMENTS:
- * This work was initially developed by Matthew Backes at Symas
+ * This work was initially developed by Emily Backes at Symas
  * Corporation for inclusion in OpenLDAP Software.
  */
 
@@ -38,6 +38,11 @@
 #define ALOCK_UNIQUE   (2)
 #define ALOCK_DIRTY            (3)
 
+#define ALOCK_SMASK            3
+
+/* lock/state where recovery is not available */
+#define        ALOCK_NOSAVE    4
+
 /* constants */
 #define ALOCK_SLOT_SIZE                (1024)
 #define ALOCK_SLOT_IATTRS      (4)
@@ -61,7 +66,7 @@ typedef struct alock_slot {
 LDAP_SLAPD_F (int) alock_open LDAP_P(( alock_info_t * info, const char * appname,
        const char * envdir, int locktype ));
 LDAP_SLAPD_F (int) alock_scan LDAP_P(( alock_info_t * info ));
-LDAP_SLAPD_F (int) alock_close LDAP_P(( alock_info_t * info ));
+LDAP_SLAPD_F (int) alock_close LDAP_P(( alock_info_t * info, int nosave ));
 LDAP_SLAPD_F (int) alock_recover LDAP_P(( alock_info_t * info ));
 
 LDAP_END_DECL