forgot to commit

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index 101de3604e519c2454005cc3a2b114eff213635c..89adc97fe62775608629d8837bf3e97862e4b2e2 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -625,6 +625,9 @@ int index_mail_next(struct index_mail *mail,
 
 void index_mail_deinit(struct index_mail *mail)
 {
+       if (mail->ibox->mail_deinit != NULL)
+                mail->ibox->mail_deinit(mail);
+
        t_push();
        index_mail_close(mail);
        t_pop();

diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index ba77a163991b42903a60357f876fae36c8769b00..a3d893f1246579cfc7594a0272e75eafc4695ebb 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -62,6 +62,7 @@ struct index_mailbox {
        struct mail *mail_interface;
 
        uint32_t (*get_recent_count)(struct index_mailbox *ibox);
+       void (*mail_deinit)(struct index_mail *mail);
        unsigned int last_recent_count;
 
        struct timeout *autosync_to;
@@ -85,7 +86,7 @@ struct index_mailbox {
        ino_t mbox_ino;
        unsigned int mbox_locks;
        struct dotlock mbox_dotlock;
-       unsigned int mbox_lock_id;
+       unsigned int mbox_lock_id, mbox_mail_lock_id;
 
        uint32_t mbox_extra_idx;