changeset 19466:6fda0b88e6fe

quota-fs: File count limits with NetBSD shouldn't be multiplied by DEV_BSIZE
author Timo Sirainen <tss@iki.fi>
date Sun, 06 Dec 2015 15:39:53 +0200
parents 74e9e665b8f1
children 00817b01020a
files src/plugins/quota/quota-fs.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/quota/quota-fs.c	Sun Dec 06 15:10:10 2015 +0200
+++ b/src/plugins/quota/quota-fs.c	Sun Dec 06 15:39:53 2015 +0200
@@ -697,8 +697,13 @@
 			root->mount->mount_path);
 		ret = -1;
 	} else {
-		*value_r = qv.qv_usage * DEV_BSIZE;
-		*limit_r = qv.qv_softlimit * DEV_BSIZE;
+		if (bytes) {
+			*value_r = qv.qv_usage * DEV_BSIZE;
+			*limit_r = qv.qv_softlimit * DEV_BSIZE;
+		} else {
+			*value_r = qv.qv_usage;
+			*limit_r = qv.qv_softlimit;
+		}
 		ret = 1;
 	}
 	quota_close(qh);