[quota] Make RPC block factor dynamic

[Petr Pisar]

commit 619d78587e42f429866827e214372874bae012f8
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Jan 11 10:16:29 2011 +0100

    Make RPC block factor dynamic
    
    Proposed to upstream at
    http://sourceforge.net/tracker/index.php?func=detail&aid=3152423&group_id=18136&atid=118136

 ...a-4.00_pre1-Make-RPC-block-factor-dynamic.patch |   82 ++++++++++++++++++++
 quota.spec                                         |    8 ++-
 2 files changed, 89 insertions(+), 1 deletions(-)
---
diff --git a/quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch b/quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch
new file mode 100644
index 0000000..4d3d27c
--- /dev/null
+++ b/quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch
@@ -0,0 +1,82 @@
+From 7e1c5c8074e5d83cfda5b66140c177954b836118 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 6 Jan 2011 17:59:27 +0100
+Subject: [PATCH] Make RPC block factor dynamic
+
+Former static factor (RPC_DQBLK_SIZE_BITS) had problem to carry values
+bigger than hard-coded limit (2^(32 + RPC_DQBLK_SIZE_BITS) - 1).
+
+This patch makes the factor dynamic. It selects best value to prevent
+overflow (XDR has 32b variables, some file system support 64b quotas)
+and to achieve highest possible precision.
+
+The client site uses the factor carried via RPC correctly.
+
+There is similar problem with setquota. This patch does not address it,
+however it can be easily resused and fixed.
+---
+ rquota_server.c |   34 +++++++++++++++++++++++++++++-----
+ 1 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/rquota_server.c b/rquota_server.c
+index 0e83689..cff6191 100644
+--- a/rquota_server.c
++++ b/rquota_server.c
+@@ -91,17 +91,42 @@ static inline void servnet2utildqblk(struct util_dqblk *u, sq_dqblk * n)
+ 		u->dqb_itime = 0;
+ }
+ 
++/* XDR transports 32b variables exactly. Find smallest needed shift to fit
++ * 64b variable into into 32 bits and to preserve precision as high as
++ * possible. */
++static int find_block_shift(qsize_t hard, qsize_t soft, qsize_t cur)
++{
++	int shift;
++	qsize_t value;
++    
++	value = (hard > soft) ? hard : soft;
++	for (shift = QUOTABLOCK_BITS; value; shift++) value >>= 1;
++
++	cur >>= shift;
++	for (; cur; shift++) cur >>= 1;
++
++	shift -= 32;
++	if (shift < 0) shift = 0;
++
++	return shift;
++}
++
+ static inline void servutil2netdqblk(struct rquota *n, struct util_dqblk *u)
+ {
+ 	time_t now;
++	int shift;
+ 
+-	time(&now);
+-	n->rq_bhardlimit = (u->dqb_bhardlimit << QUOTABLOCK_BITS) >> RPC_DQBLK_SIZE_BITS;
+-	n->rq_bsoftlimit = (u->dqb_bsoftlimit << QUOTABLOCK_BITS) >> RPC_DQBLK_SIZE_BITS;
++	shift = find_block_shift(u->dqb_bhardlimit, u->dqb_bsoftlimit,
++		u->dqb_curspace);
++	n->rq_bsize = 1 << shift;
++	n->rq_bhardlimit = (u->dqb_bhardlimit << QUOTABLOCK_BITS) >> shift;
++	n->rq_bsoftlimit = (u->dqb_bsoftlimit << QUOTABLOCK_BITS) >> shift;
+ 	n->rq_fhardlimit = u->dqb_ihardlimit;
+ 	n->rq_fsoftlimit = u->dqb_isoftlimit;
+-	n->rq_curblocks = (u->dqb_curspace + RPC_DQBLK_SIZE - 1) >> RPC_DQBLK_SIZE_BITS;
++	n->rq_curblocks = (u->dqb_curspace + n->rq_bsize - 1) >> shift;
+ 	n->rq_curfiles = u->dqb_curinodes;
++
++	time(&now);
+ 	if (u->dqb_btime)
+ 		n->rq_btimeleft = u->dqb_btime - now;
+ 	else
+@@ -258,7 +283,6 @@ getquota_rslt *getquotainfo(int lflags, caddr_t * argp, struct svc_req * rqstp)
+ 	}
+ 
+ 	result.status = Q_NOQUOTA;
+-	result.getquota_rslt_u.gqr_rquota.rq_bsize = RPC_DQBLK_SIZE;
+ 
+ 	if (init_mounts_scan(1, &pathp, MS_QUIET | MS_NO_MNTPOINT | MS_NFS_ALL | ((flags & FL_AUTOFS) ? 0 : MS_NO_AUTOFS)) < 0)
+ 		goto out;
+-- 
+1.7.3.4
+
diff --git a/quota.spec b/quota.spec
index 49db239..6f049ac 100644
--- a/quota.spec
+++ b/quota.spec
@@ -5,7 +5,7 @@ Name: quota
 Summary: System administration tools for monitoring users' disk usage
 Epoch: 1
 Version: 4.00
-Release: 0.3.pre1%{?dist}
+Release: 0.4.pre1%{?dist}
 License: BSD and GPLv2+
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -33,6 +33,8 @@ Patch10: quota-4.00_pre1-add-gfs2-support.patch
 # In upstream 4.00_pre2
 Patch11: quota-4.00_pre1-Add-always-resolve-to-quota.1-manpage.patch
 Patch12: quota-4.00_pre1-Document-always-resolve-at-edquota-and-setquota.patch
+# Bug #667757
+Patch13: quota-4.00_pre1-Make-RPC-block-factor-dynamic.patch
 
 %description
 The quota package contains system administration tools for monitoring
@@ -115,6 +117,7 @@ Linux/UNIX environment.
 %patch10 -p1 -b .gfs2
 %patch11 -p1 -b .document_always_resolve_quota
 %patch12 -p1 -b .document_always_resolve_setquota
+%patch13 -p1 -b .rpc_block_factor_dynamic
 # quotactl(2) moved into `man-pages' package (bug #640590)
 rm -f quotactl.2
 # remove VCS files
@@ -236,6 +239,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan 11 2011 Petr Pisar <ppisar at redhat.com> - 1:4.00-0.4.pre1
+- Make RPC block factor dynamic (bug #667757)
+
 * Mon Jan 10 2011 Petr Pisar <ppisar at redhat.com> - 1:4.00-0.3.pre1
 - Document --always-resolve option