nfsd: wrap too long lines in nfsd4_encode_read
authorChristoph Hellwig <hch@lst.de>
Thu, 18 Jun 2015 14:45:02 +0000 (16:45 +0200)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 22 Jun 2015 18:15:05 +0000 (14:15 -0400)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4xdr.c

index ca09fec7a4bf7a4fecaca3768bd2c9da459e323a..54633858733a8da5ac978fe1d19a0a055488e01d 100644 (file)
@@ -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);