[PATCH] fix nfsacl pointer arithmetic and pg_class initialization bugs

[net-next-2.6.git] / fs / nfs / nfs3xdr.c

diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index a4437fb177f08b4b5b6c20b0f7bf8868b9a94bf6..db4a904810a460f0dd6090b12c65c7e5526ac499 100644 (file)
--- a/fs/nfs/nfs3xdr.c
+++ b/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);