[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-uidlist.c, 1.46, 1.47

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv9314/lib-storage/index/maildir

Modified Files:
	maildir-uidlist.c 
Log Message:
Renamed safe-open.* to nfs-workarounds.*, safe_open() to nfs_safe_open() and
added a new global NFS_ESTALE_RETRY_COUNT which everyone uses instead of
defining their own.



Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- maildir-uidlist.c	26 Feb 2006 10:05:18 -0000	1.46
+++ maildir-uidlist.c	26 Feb 2006 10:15:41 -0000	1.47
@@ -8,7 +8,7 @@
 #include "str.h"
 #include "file-dotlock.h"
 #include "close-keep-errno.h"
-#include "safe-open.h"
+#include "nfs-workarounds.h"
 #include "write-full.h"
 #include "maildir-storage.h"
 #include "maildir-uidlist.h"
@@ -20,7 +20,7 @@
 
 /* NFS: How many times to retry reading dovecot-uidlist file if ESTALE
    error occurs in the middle of reading it */
-#define UIDLIST_ESTALE_RETRY_COUNT 10
+#define UIDLIST_ESTALE_RETRY_COUNT NFS_ESTALE_RETRY_COUNT
 
 /* how many seconds to wait before overriding uidlist.lock */
 #define UIDLIST_LOCK_STALE_TIMEOUT (60*2)
@@ -258,7 +258,7 @@
 
         *retry_r = FALSE;
 
-	fd = safe_open(uidlist->fname, O_RDONLY);
+	fd = nfs_safe_open(uidlist->fname, O_RDONLY);
 	if (fd == -1) {
 		if (errno != ENOENT) {
 			mail_storage_set_critical(storage,