From d0f612e5f51b4b0bd4963e47da592cac70bcf6d1 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Fri, 8 Dec 2006 02:39:40 -0800
Subject: [PATCH] --- yaml --- r: 43751 b: refs/heads/master c:
 14d2b59e8c1634ceb995097b162592b0af139578 h: refs/heads/master i:   43749:
 d8e49ae2f57a8694c8b77f04453884cc0f8c4abe   43747:
 cbceb78308c3605421863e504232d750e62393a1   43743:
 4042183d122e5f90630ea4c76e4b5225dd31487c v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfs3acl.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2e93e4da1e0e..3e02813aa210 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb65a5ba3dcef3184ef1ba026b1e268bd1a9323f
+refs/heads/master: 14d2b59e8c1634ceb995097b162592b0af139578
diff --git a/trunk/fs/nfsd/nfs3acl.c b/trunk/fs/nfsd/nfs3acl.c
index fcad2895ddb0..3e3f2de82c36 100644
--- a/trunk/fs/nfsd/nfs3acl.c
+++ b/trunk/fs/nfsd/nfs3acl.c
@@ -171,19 +171,19 @@ static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
 	p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh);
 	if (resp->status == 0 && dentry && dentry->d_inode) {
 		struct inode *inode = dentry->d_inode;
-		int w = nfsacl_size(
-			(resp->mask & NFS_ACL)   ? resp->acl_access  : NULL,
-			(resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
 		struct kvec *head = rqstp->rq_res.head;
 		unsigned int base;
 		int n;
+		int w;
 
 		*p++ = htonl(resp->mask);
 		if (!xdr_ressize_check(rqstp, p))
 			return 0;
 		base = (char *)p - (char *)head->iov_base;
 
-		rqstp->rq_res.page_len = w;
+		rqstp->rq_res.page_len = w = nfsacl_size(
+			(resp->mask & NFS_ACL)   ? resp->acl_access  : NULL,
+			(resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
 		while (w > 0) {
 			if (!rqstp->rq_respages[rqstp->rq_resused++])
 				return 0;