From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 25 Mar 2022 08:09:57 +0000 (+0200)
Subject: quota: count - Always count with virtual size
X-Git-Tag: 2.4.0~4184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eea96dafef3bb290a290a7aca99148e483e7da8f;p=thirdparty%2Fdovecot%2Fcore.git

quota: count - Always count with virtual size

This code was needed because it was used by dict quota,
which is now removed.
---

diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c
index 93a6f1eaa8..b86f77ca95 100644
--- a/src/plugins/quota/quota-count.c
+++ b/src/plugins/quota/quota-count.c
@@ -47,9 +47,7 @@ quota_count_mailbox(struct quota_root *root, struct mail_namespace *ns,
 	if ((box->storage->class_flags & MAIL_STORAGE_CLASS_FLAG_NOQUOTA) != 0) {
 		/* quota doesn't exist for this mailbox/storage */
 		ret = 0;
-	} else if (mailbox_get_metadata(box, root->quota->set->vsizes ?
-					MAILBOX_METADATA_VIRTUAL_SIZE :
-					MAILBOX_METADATA_PHYSICAL_SIZE,
+	} else if (mailbox_get_metadata(box, MAILBOX_METADATA_VIRTUAL_SIZE,
 					&metadata) < 0 ||
 	    mailbox_get_status(box, STATUS_MESSAGES, &status) < 0) {
 		errstr = mailbox_get_last_internal_error(box, &error);
@@ -72,8 +70,7 @@ quota_count_mailbox(struct quota_root *root, struct mail_namespace *ns,
 		}
 	} else {
 		ret = 0;
-		*bytes += root->quota->set->vsizes ?
-			metadata.virtual_size : metadata.physical_size;
+		*bytes += metadata.virtual_size;
 		*count += status.messages;
 	}
 	mailbox_free(&box);