quota: Try to avoid logging NFS stale fhandle errors when closing maildirsize file.

diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index 12d210cabd3879f313a29a3a95cfd746206bcf9a..ffdc9f678e79d4e9335741dfd3212b9a4e72665c 100644 (file)
--- a/src/plugins/quota/quota-maildir.c
+++ b/src/plugins/quota/quota-maildir.c
@@ -296,13 +296,10 @@ static int maildirsize_write(struct maildir_quota_root *root, const char *path)
                return -1;
        }
 
-       /* keep the fd open since we might want to update it later */
-       if (file_dotlock_replace(&dotlock,
-                                DOTLOCK_REPLACE_FLAG_DONT_CLOSE_FD) < 0) {
+       if (file_dotlock_replace(&dotlock, 0) < 0) {
                i_error("file_dotlock_replace(%s) failed: %m", path);
                return -1;
        }
-       root->fd = fd;
        return 0;
 }
 
@@ -872,8 +869,11 @@ maildir_quota_update(struct quota_root *_root,
                (void)close(root->fd);
                root->fd = -1;
                (void)maildirsize_recalculate(root);
-       } else if (maildirsize_update(root, ctx->count_used, ctx->bytes_used) < 0)
+       } else if (maildirsize_update(root, ctx->count_used, ctx->bytes_used) < 0) {
+               (void)close(root->fd);
+               root->fd = -1;
                maildirsize_rebuild_later(root);
+       }
 
        return 0;
 }