Fix repquota(8) to work with quotas over 4TB (Jan Kara, Michael Meier)

3 files changed, 6 insertions, 1 deletions

diff --git a/Changelog b/Changelog
index fe58e6c..b0fdeb7 100644
--- a/Changelog
+++ b/Changelog
@@ -1,9 +1,11 @@
 Changes in quota-tools from 3.16 to 3.17
+* Added quota_nld to the list of installed programs (Jan Kara)
 * some typos fixes (Matthew Boyle)
 * fixed possible segfault when unpriviledged user run edquota (Matthew Boyle)
 * fixed format strings to use "%llu" and "%lld" instead of "%Lu" and "%Ld" (Ladislav Michnovic)
 * removed ssl, resolv, lber from the list of LDAP libraries since we don't need them directly (Jan Kara)
 * added limits.h include to quota_nld (Jan Kara)
+* fixed repquota to work with limits over 4 TB (Jan Kara, Michael Meier)
 
 Changes in quota-tools from 3.15 to 3.16
 * added information message about journaled quota to quotacheck (Jan Kara, Alex Tomas)
diff --git a/Makefile.in b/Makefile.in
index c1dc181..ef119dc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,6 +101,9 @@ install: all @INSTMO@
 	-$(INSTALL) -m 644 rquota.h rquota.x $(ROOTDIR)$(includedir)/rpcsvc
 	-$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota $(ROOTDIR)$(bindir)
 	-$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) rpc.rquotad $(ROOTDIR)$(sbindir)
+ifneq ($(NETLINKLIBS),)
+	-$(INSTALL) $(STRIP) -m $(DEF_SBIN_MODE) quota_nld $(ROOTDIR)$(sbindir)
+endif
 	-$(INSTALL) -m $(DEF_MAN_MODE) *.1 $(ROOTDIR)$(mandir)/man1
 	-$(INSTALL) -m $(DEF_MAN_MODE) *.2 $(ROOTDIR)$(mandir)/man2
 	-$(INSTALL) -m $(DEF_MAN_MODE) *.3 $(ROOTDIR)$(mandir)/man3
diff --git a/repquota.c b/repquota.c
index fae5911..adcfa42 100644
--- a/repquota.c
+++ b/repquota.c
@@ -158,7 +158,7 @@ static void parse_options(int argcnt, char **argstr)
 }
 
 /* Are we over soft or hard limit? */
-static char overlim(uint usage, uint softlim, uint hardlim)
+static char overlim(qsize_t usage, qsize_t softlim, qsize_t hardlim)
 {
 	if ((usage > softlim && softlim) || (usage > hardlim && hardlim))
 		return '+';