Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68e8bb03 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

nfsd: wrap too long lines in nfsd4_encode_read 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 96bcad50

fs/nfsd/nfs4xdr.c

+6 −3
Original line number Diff line number Diff line
@@ -3431,7 +3431,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 
		nfserr = nfserr_resource;

		goto out;

	}

	if (resp->xdr.buf->page_len && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) {

	if (resp->xdr.buf->page_len &&

	    test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) {

		WARN_ON_ONCE(1);

		nfserr = nfserr_resource;

		goto out;
@@ -3439,13 +3440,15 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 
	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,

			 (xdr->buf->buflen - xdr->buf->len));

	maxcount = min_t(unsigned long, maxcount, read->rd_length);



	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))

	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);