irq_work: Optimize irq_work_single()

[linux-2.6-microblaze.git] / fs / nfs / nfs4xdr.c

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 0b3510f..c6dbfca 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -5308,7 +5308,6 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
        uint32_t attrlen,
                 bitmap[3] = {0};
        int status;
-       unsigned int pg_offset;
 
        res->acl_len = 0;
        if ((status = decode_op_hdr(xdr, OP_GETATTR)) != 0)
@@ -5316,9 +5315,6 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
 
        xdr_enter_page(xdr, xdr->buf->page_len);
 
-       /* Calculate the offset of the page data */
-       pg_offset = xdr->buf->head[0].iov_len;
-
        if ((status = decode_attr_bitmap(xdr, bitmap)) != 0)
                goto out;
        if ((status = decode_attr_length(xdr, &attrlen, &savep)) != 0)
@@ -5331,7 +5327,7 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req,
                /* The bitmap (xdr len + bitmaps) and the attr xdr len words
                 * are stored with the acl data to handle the problem of
                 * variable length bitmaps.*/
-               res->acl_data_offset = xdr_stream_pos(xdr) - pg_offset;
+               res->acl_data_offset = xdr_page_pos(xdr);
                res->acl_len = attrlen;
 
                /* Check for receive buffer overflow */
@@ -7619,6 +7615,7 @@ const struct rpc_procinfo nfs4_procedures[] = {
        PROC42(SETXATTR,        enc_setxattr,           dec_setxattr),
        PROC42(LISTXATTRS,      enc_listxattrs,         dec_listxattrs),
        PROC42(REMOVEXATTR,     enc_removexattr,        dec_removexattr),
+       PROC42(READ_PLUS,       enc_read_plus,          dec_read_plus),
 };
 
 static unsigned int nfs_version4_counts[ARRAY_SIZE(nfs4_procedures)];