From patchwork Fri Feb 22 21:58:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 10827017 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AB7621575 for ; Fri, 22 Feb 2019 21:58:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94CE5313F8 for ; Fri, 22 Feb 2019 21:58:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 883D7290B9; Fri, 22 Feb 2019 21:58:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1CEE326F0 for ; Fri, 22 Feb 2019 21:58:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725911AbfBVV64 (ORCPT ); Fri, 22 Feb 2019 16:58:56 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:35626 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725859AbfBVV6z (ORCPT ); Fri, 22 Feb 2019 16:58:55 -0500 Received: by mail-it1-f196.google.com with SMTP id v72so5489123itc.0 for ; Fri, 22 Feb 2019 13:58:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qV3H6/nt5cBtzHk8iz/yqH4FKIxUdlc/uQOn6PZUrg0=; b=DlltUKV5gaR8UiuaGGfH31C6ZK3t68nhEEOSKjCspsjYnGaQB3zYojtrtnwL5xcsj/ m7VeGsDAaE7CgBxJ86h8blYDULmuJ5bhAbpQroqki38odDjFZFs97KXBCTlOGwc1zma4 2zARQ2yhWjRsTutVP5epZx7go/Dv8lm/IjTsVPdtqpmRhPcIfqK2EFxKTlWlh14FWwHl 5OoKvzVJ5+OkQqJvrX0NgQqU/X8ypIr2tPHnAyX6pP1oqPTMMf1JDv5CAz3IIRSYakDv rf89rUvH6JhyizJbNBvSB/sI8HnljipuqjYwn8mquy06/XQsAobzpMIVBYv/mBdApLKh NawA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qV3H6/nt5cBtzHk8iz/yqH4FKIxUdlc/uQOn6PZUrg0=; b=X6HJLO+B1ruQwzR4+3ILQC9TGhDl+GfEC8uzd1JPQVNsKtccv6D3V1OqsLO4UVhFEg oCu4vUAP5tuBT3g1YLd2/mATij3IMNtD/9gjJnzz5ovBh3GAQlaXJ4O9xtAcGTSlLdOR 29gFxvvIcbIkM6/xKE5rX03WNl5ulzey8QG+o6hS5Oni8eAiZ7nsz6KSzTfL2fwWtCOJ g/9Oz+hLKbaHSaGnihrgF/RaFZOZspt+splriLHSuJQLqaJP0cXYz3fX2ZyI6co3KyXh ILKYv1rejM0vulvz80o6f/tQ43ZNK8hOaXrrY3KuOV6MBmVA+pns+B+lHN9oZA8l308S EYRA== X-Gm-Message-State: AHQUAuaEJKvcLst8HZp9Ak+38nP0io80LR+YxbejZRGeUHNlsmq8NfXP fp+ewVEKOIDzJoRI7NLy6ZR8bEZg/x8= X-Google-Smtp-Source: AHgI3Ibl4UxYctVNvxux7Dt6bE9fQyGrFBMACHakjfbxMeXOmtZSFAnURK0UMJ2hURWdB9kxMfGNLg== X-Received: by 2002:a24:5647:: with SMTP id o68mr3695474itb.151.1550872734419; Fri, 22 Feb 2019 13:58:54 -0800 (PST) Received: from gouda.nowheycreamery.com.nowheycreamery.com (d28-23-121-75.dim.wideopenwest.com. [23.28.75.121]) by smtp.gmail.com with ESMTPSA id t74sm1532459itt.29.2019.02.22.13.58.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 13:58:53 -0800 (PST) From: Anna Schumaker X-Google-Original-From: Anna Schumaker To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] NFSD: nfsd4_encode_read{v}() should encode eof and maxcount Date: Fri, 22 Feb 2019 16:58:49 -0500 Message-Id: <20190222215850.20508-2-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190222215850.20508-1-Anna.Schumaker@Netapp.com> References: <20190222215850.20508-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I intend to reuse nfsd4_encode_readv() for READ_PLUS, so I need an alternate way to encode these values. I think it makes sense for nfsd4_encode_read() to handle this in a single place for both splice and readv paths. Signed-off-by: Anna Schumaker --- fs/nfsd/nfs4xdr.c | 67 ++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 3de42a729093..bb487e5c022c 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3453,24 +3453,19 @@ nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, __be32 nfserr, struc static __be32 nfsd4_encode_splice_read( struct nfsd4_compoundres *resp, struct nfsd4_read *read, - struct file *file, unsigned long maxcount) + struct file *file, unsigned long *maxcount) { struct xdr_stream *xdr = &resp->xdr; struct xdr_buf *buf = xdr->buf; - u32 eof; - long len; int space_left; __be32 nfserr; - __be32 *p = xdr->p - 2; /* Make sure there will be room for padding if needed */ if (xdr->end - xdr->p < 1) return nfserr_resource; - len = maxcount; nfserr = nfsd_splice_read(read->rd_rqstp, read->rd_fhp, - file, read->rd_offset, &maxcount); - read->rd_length = maxcount; + file, read->rd_offset, maxcount); if (nfserr) { /* * nfsd_splice_actor may have already messed with the @@ -3481,27 +3476,21 @@ static __be32 nfsd4_encode_splice_read( return nfserr; } - eof = nfsd_eof_on_read(len, maxcount, read->rd_offset, - d_inode(read->rd_fhp->fh_dentry)->i_size); - - *(p++) = htonl(eof); - *(p++) = htonl(maxcount); - - buf->page_len = maxcount; - buf->len += maxcount; - xdr->page_ptr += (buf->page_base + maxcount + PAGE_SIZE - 1) + buf->page_len = *maxcount; + buf->len += *maxcount; + xdr->page_ptr += (buf->page_base + *maxcount + PAGE_SIZE - 1) / PAGE_SIZE; /* Use rest of head for padding and remaining ops: */ buf->tail[0].iov_base = xdr->p; buf->tail[0].iov_len = 0; xdr->iov = buf->tail; - if (maxcount&3) { - int pad = 4 - (maxcount&3); + if (*maxcount&3) { + int pad = 4 - (*maxcount&3); *(xdr->p++) = 0; - buf->tail[0].iov_base += maxcount&3; + buf->tail[0].iov_base += *maxcount&3; buf->tail[0].iov_len = pad; buf->len += pad; } @@ -3516,21 +3505,19 @@ static __be32 nfsd4_encode_splice_read( static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, struct nfsd4_read *read, - struct file *file, unsigned long maxcount) + struct file *file, unsigned long *maxcount) { struct xdr_stream *xdr = &resp->xdr; - u32 eof; int v; - int starting_len = xdr->buf->len - 8; + int starting_len = xdr->buf->len; long len; int thislen; __be32 nfserr; - __be32 tmp; __be32 *p; u32 zzz = 0; int pad; - len = maxcount; + len = *maxcount; v = 0; thislen = min_t(long, len, ((void *)xdr->end - (void *)xdr->p)); @@ -3552,25 +3539,14 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, } read->rd_vlen = v; - len = maxcount; nfserr = nfsd_readv(resp->rqstp, read->rd_fhp, file, read->rd_offset, - resp->rqstp->rq_vec, read->rd_vlen, &maxcount); - read->rd_length = maxcount; + resp->rqstp->rq_vec, read->rd_vlen, maxcount); if (nfserr) return nfserr; - xdr_truncate_encode(xdr, starting_len + 8 + ((maxcount+3)&~3)); - - eof = nfsd_eof_on_read(len, maxcount, read->rd_offset, - d_inode(read->rd_fhp->fh_dentry)->i_size); + xdr_truncate_encode(xdr, starting_len + ((*maxcount+3)&~3)); - tmp = htonl(eof); - write_bytes_to_xdr_buf(xdr->buf, starting_len , &tmp, 4); - tmp = htonl(maxcount); - write_bytes_to_xdr_buf(xdr->buf, starting_len + 4, &tmp, 4); - - pad = (maxcount&3) ? 4 - (maxcount&3) : 0; - write_bytes_to_xdr_buf(xdr->buf, starting_len + 8 + maxcount, - &zzz, pad); + pad = (*maxcount&3) ? 4 - (*maxcount&3) : 0; + write_bytes_to_xdr_buf(xdr->buf, starting_len + *maxcount, &zzz, pad); return 0; } @@ -3585,6 +3561,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, int starting_len = xdr->buf->len; struct raparms *ra = NULL; __be32 *p; + long len; + u32 eof; p = xdr_reserve_space(xdr, 8); /* eof flag and byte count */ if (!p) { @@ -3602,15 +3580,22 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, maxcount = min_t(unsigned long, maxcount, (xdr->buf->buflen - xdr->buf->len)); maxcount = min_t(unsigned long, maxcount, read->rd_length); + len = maxcount; if (read->rd_tmp_file) ra = nfsd_init_raparms(file); if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) - nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount); + nfserr = nfsd4_encode_splice_read(resp, read, file, &maxcount); else - nfserr = nfsd4_encode_readv(resp, read, file, maxcount); + nfserr = nfsd4_encode_readv(resp, read, file, &maxcount); + + read->rd_length = maxcount; + eof = nfsd_eof_on_read(len, maxcount, read->rd_offset, + d_inode(read->rd_fhp->fh_dentry)->i_size); + *p++ = cpu_to_be32(eof); + *p++ = cpu_to_be32(maxcount); if (ra) nfsd_put_raparams(file, ra); From patchwork Fri Feb 22 21:58:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 10827019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C53C21575 for ; Fri, 22 Feb 2019 21:58:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFC5D2CDE6 for ; Fri, 22 Feb 2019 21:58:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A2E2C29FA4; Fri, 22 Feb 2019 21:58:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F8352958F for ; Fri, 22 Feb 2019 21:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725859AbfBVV65 (ORCPT ); Fri, 22 Feb 2019 16:58:57 -0500 Received: from mail-it1-f194.google.com ([209.85.166.194]:38155 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725832AbfBVV64 (ORCPT ); Fri, 22 Feb 2019 16:58:56 -0500 Received: by mail-it1-f194.google.com with SMTP id l66so5462495itg.3 for ; Fri, 22 Feb 2019 13:58:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c19mU9xxCZ+W0WDN14jOva6jpIOjR0D5ezB4RZcR8j8=; b=RDI47Ep+w6hR4WmMd1Ze50t1eRQYkg0dkeMgTFoc87uTZX/CB63lyB7bTowx4ZyXPf bRlcdpIoSPgCAE+eeXXB/4ZEO3QZCwUh1cIZm+xfi6WIJTDUA5rcUzs2gxpGzMbp83cC zxlebymoc24l1twVz/Y8nSKInO9ui8UBfvjPj10DPEbv+H6N1YHWoYpvajO3y8cGyWRs NVlVC5MygGD9OCPM4iCyZUItcCyw4qidxRtrfSAhWWVBCOwCNDg4Ci7kqNP8/TJz5H4S 3qcgF0aZSA1AqNmyNpPDvvihDqHeMd9c/1QrOYI4qyJLB1oCGlj5l8FGVaJST/hV/sN/ WP7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=c19mU9xxCZ+W0WDN14jOva6jpIOjR0D5ezB4RZcR8j8=; b=kvN/rs3ssUz4WimObKO+gpf7HytarhxzFSImc8ss+4rVYxAp6UeSgZ3tpzFSBDLdAU 3FoNritvD8kq0bB4AXb+/m0vV91R5O8C2uJI3708i0ay9Q7ue8krJqOGnFxqAjYQh9GB REkJYvS8iWjPnSsD1AJvLsDPrrNCawgb9AG+n+aYLCzwx/oH4/2dtVgHe0kesqfUmOIu Br+yZ0BECjd2YVNE7bxfAu/tNzbiVo9H+SrdT+mSA5btwN74bT+UuSnm0PA+y1xiuDNP JSOOGKwHqp2Dhvbdh8fbuPNTD53LCq6Ow1a+Pj9G2BPSKIL1qDtk1KNle+oFgvo9/Wyq NThA== X-Gm-Message-State: AHQUAubHsqVZN+9D3LFcc64B25f6M3BdFvsnuGrplLuE9TK6XQnuwfr6 +pSAXKTQJ9T1EcHM6vwY0oUGddLwBjY= X-Google-Smtp-Source: AHgI3Ibli1+cEvKV+It19hnADLLesdtl9GAmTasrP5RIm1TCwNS3UEItmLkGsDYKtkPbGk1KpQU2/Q== X-Received: by 2002:a24:f443:: with SMTP id u3mr3409702iti.165.1550872735177; Fri, 22 Feb 2019 13:58:55 -0800 (PST) Received: from gouda.nowheycreamery.com.nowheycreamery.com (d28-23-121-75.dim.wideopenwest.com. [23.28.75.121]) by smtp.gmail.com with ESMTPSA id t74sm1532459itt.29.2019.02.22.13.58.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 13:58:54 -0800 (PST) From: Anna Schumaker X-Google-Original-From: Anna Schumaker To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] NFSD: Add basic READ_PLUS support Date: Fri, 22 Feb 2019 16:58:50 -0500 Message-Id: <20190222215850.20508-3-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190222215850.20508-1-Anna.Schumaker@Netapp.com> References: <20190222215850.20508-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds READ_PLUS support for both NFS4_CONTENT_DATA and NFS4_CONTENT_HOLE segments. I keep things simple for now by only returning a hole segment if it is the first segment found at the given offset. Everything else, including other hole segments, will be encoded as data. Signed-off-by: Anna Schumaker --- fs/nfsd/nfs4proc.c | 16 +++++++ fs/nfsd/nfs4xdr.c | 113 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 127 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 0cfd257ffdaf..1c5f2c3da55f 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2180,6 +2180,16 @@ static inline u32 nfsd4_read_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) return (op_encode_hdr_size + 2 + XDR_QUADLEN(rlen)) * sizeof(__be32); } +static inline u32 nfsd4_read_plus_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) +{ + u32 maxcount = svc_max_payload(rqstp); + u32 rlen = min(op->u.read.rd_length, maxcount); + /* enough extra xdr space for encoding either a hole or data segment. */ + u32 xdr = 5; + + return (op_encode_hdr_size + 2 + xdr + XDR_QUADLEN(rlen)) * sizeof(__be32); +} + static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) { u32 maxcount = 0, rlen = 0; @@ -2701,6 +2711,12 @@ static const struct nfsd4_operation nfsd4_ops[] = { .op_name = "OP_COPY", .op_rsize_bop = nfsd4_copy_rsize, }, + [OP_READ_PLUS] = { + .op_func = nfsd4_read, + .op_name = "OP_READ_PLUS", + .op_rsize_bop = nfsd4_read_plus_rsize, + .op_get_currentstateid = nfsd4_get_readstateid, + }, [OP_SEEK] = { .op_func = nfsd4_seek, .op_name = "OP_SEEK", diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index bb487e5c022c..ec953efd24c2 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1882,7 +1882,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = { [OP_LAYOUTSTATS] = (nfsd4_dec)nfsd4_decode_notsupp, [OP_OFFLOAD_CANCEL] = (nfsd4_dec)nfsd4_decode_offload_status, [OP_OFFLOAD_STATUS] = (nfsd4_dec)nfsd4_decode_offload_status, - [OP_READ_PLUS] = (nfsd4_dec)nfsd4_decode_notsupp, + [OP_READ_PLUS] = (nfsd4_dec)nfsd4_decode_read, [OP_SEEK] = (nfsd4_dec)nfsd4_decode_seek, [OP_WRITE_SAME] = (nfsd4_dec)nfsd4_decode_notsupp, [OP_CLONE] = (nfsd4_dec)nfsd4_decode_clone, @@ -4273,7 +4273,116 @@ nfsd4_encode_offload_status(struct nfsd4_compoundres *resp, __be32 nfserr, return nfserr_resource; p = xdr_encode_hyper(p, os->count); *p++ = cpu_to_be32(0); + return nfserr; +} + +static __be32 +nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, struct nfsd4_read *read, + struct file *file) +{ + struct xdr_stream *xdr = &resp->xdr; + unsigned long maxcount; + __be32 *p, nfserr; + + p = xdr_reserve_space(xdr, 4 + 8 + 4); + if (!p) + return nfserr_resource; + xdr_commit_encode(xdr); + + maxcount = svc_max_payload(resp->rqstp); + maxcount = min_t(unsigned long, maxcount, + (xdr->buf->buflen - xdr->buf->len)); + maxcount = min_t(unsigned long, maxcount, read->rd_length); + + if (file->f_op->splice_read && + test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) + nfserr = nfsd4_encode_splice_read(resp, read, file, &maxcount); + else + nfserr = nfsd4_encode_readv(resp, read, file, &maxcount); + + *p++ = cpu_to_be32(NFS4_CONTENT_DATA); + p = xdr_encode_hyper(p, read->rd_offset); + *p++ = cpu_to_be32(maxcount); + + read->rd_offset += maxcount; + return nfserr; +} + +static __be32 +nfsd4_encode_read_plus_hole(struct nfsd4_compoundres *resp, struct nfsd4_read *read, + unsigned long length) +{ + __be32 *p = xdr_reserve_space(&resp->xdr, 4 + 8 + 8); + if (!p) + return nfserr_resource; + + length = min_t(unsigned long, read->rd_length, length); + + *p++ = cpu_to_be32(NFS4_CONTENT_HOLE); + p = xdr_encode_hyper(p, read->rd_offset); + p = xdr_encode_hyper(p, length); + + read->rd_offset += length; + read->rd_length -= length; + return nfs_ok; +} +static __be32 +nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, + struct nfsd4_read *read) +{ + struct xdr_stream *xdr = &resp->xdr; + struct file *file = read->rd_filp; + int starting_len = xdr->buf->len; + struct raparms *ra = NULL; + loff_t data_pos; + __be32 *p; + u32 eof, segments = 0; + + if (nfserr) + goto out; + + /* eof flag, segment count */ + p = xdr_reserve_space(xdr, 4 + 4 ); + if (!p) { + nfserr = nfserr_resource; + goto out; + } + xdr_commit_encode(xdr); + + if (read->rd_tmp_file) + ra = nfsd_init_raparms(file); + + data_pos = vfs_llseek(file, read->rd_offset, SEEK_DATA); + if (data_pos == -ENXIO) + data_pos = i_size_read(file_inode(file)); + + if (data_pos > read->rd_offset) { + nfserr = nfsd4_encode_read_plus_hole(resp, read, + data_pos - read->rd_offset); + if (nfserr) + goto out; + segments++; + } + + if (read->rd_length > 0) { + nfserr = nfsd4_encode_read_plus_data(resp, read, file); + segments++; + } + + eof = (read->rd_offset >= i_size_read(file_inode(file))); + *p++ = cpu_to_be32(eof); + *p++ = cpu_to_be32(segments); + + if (ra) + nfsd_put_raparams(file, ra); + + if (nfserr) + xdr_truncate_encode(xdr, starting_len); + +out: + if (file) + fput(file); return nfserr; } @@ -4381,7 +4490,7 @@ static const nfsd4_enc nfsd4_enc_ops[] = { [OP_LAYOUTSTATS] = (nfsd4_enc)nfsd4_encode_noop, [OP_OFFLOAD_CANCEL] = (nfsd4_enc)nfsd4_encode_noop, [OP_OFFLOAD_STATUS] = (nfsd4_enc)nfsd4_encode_offload_status, - [OP_READ_PLUS] = (nfsd4_enc)nfsd4_encode_noop, + [OP_READ_PLUS] = (nfsd4_enc)nfsd4_encode_read_plus, [OP_SEEK] = (nfsd4_enc)nfsd4_encode_seek, [OP_WRITE_SAME] = (nfsd4_enc)nfsd4_encode_noop, [OP_CLONE] = (nfsd4_enc)nfsd4_encode_noop,