From 685b48355b7b8dd8a62da44b1acf3e8a1d88c47a Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Wed, 22 Jun 2005 17:16:28 +0000
Subject: [PATCH] --- yaml --- r: 2787 b: refs/heads/master c:
 213484254c65e3c39c59df454132748b1367f816 h: refs/heads/master i:   2785:
 6c3434fc5e50f3223018837f6a47c2adbe61f017   2783:
 4891d4685e612776dcf0e1003c6e93ae2deea6b0 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfs/nfs3xdr.c | 2 +-
 trunk/fs/nfsd/nfssvc.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 506782d0901c..36009ee68d8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 458818ed76d3f495f9f32373c936456c9427f759
+refs/heads/master: 213484254c65e3c39c59df454132748b1367f816
diff --git a/trunk/fs/nfs/nfs3xdr.c b/trunk/fs/nfs/nfs3xdr.c
index a4437fb177f0..db4a904810a4 100644
--- a/trunk/fs/nfs/nfs3xdr.c
+++ b/trunk/fs/nfs/nfs3xdr.c
@@ -677,7 +677,7 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req, u32 *p,
 	/* put as much of the acls into head as possible. */
 	len_in_head = min_t(unsigned int, buf->head->iov_len - base, len);
 	len -= len_in_head;
-	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p + len_in_head);
+	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p + (len_in_head >> 2));
 
 	for (count = 0; (count << PAGE_SHIFT) < len; count++) {
 		args->pages[count] = alloc_page(GFP_KERNEL);
diff --git a/trunk/fs/nfsd/nfssvc.c b/trunk/fs/nfsd/nfssvc.c
index 79b25b19fec8..904df604e86b 100644
--- a/trunk/fs/nfsd/nfssvc.c
+++ b/trunk/fs/nfsd/nfssvc.c
@@ -376,6 +376,7 @@ static struct svc_program	nfsd_acl_program = {
 	.pg_nvers		= NFSD_ACL_NRVERS,
 	.pg_vers		= nfsd_acl_version,
 	.pg_name		= "nfsd",
+	.pg_class		= "nfsd",
 	.pg_stats		= &nfsd_acl_svcstats,
 };