tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

nfsd: wrap too long lines in nfsd4_encode_read

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

authored by

Christoph Hellwig and committed by
J. Bruce Fields 68e8bb03 96bcad50

+6 -3
+6 -3
fs/nfsd/nfs4xdr.c
··· 3431 3431 nfserr = nfserr_resource; 3432 3432 goto out; 3433 3433 } 3434 - if (resp->xdr.buf->page_len && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) { 3434 + if (resp->xdr.buf->page_len && 3435 + test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) { 3435 3436 WARN_ON_ONCE(1); 3436 3437 nfserr = nfserr_resource; 3437 3438 goto out; ··· 3440 3439 xdr_commit_encode(xdr); 3441 3440 3442 3441 maxcount = svc_max_payload(resp->rqstp); 3443 - maxcount = min_t(unsigned long, maxcount, (xdr->buf->buflen - xdr->buf->len)); 3442 + maxcount = min_t(unsigned long, maxcount, 3443 + (xdr->buf->buflen - xdr->buf->len)); 3444 3444 maxcount = min_t(unsigned long, maxcount, read->rd_length); 3445 3445 3446 3446 if (read->rd_tmp_file) 3447 3447 ra = nfsd_init_raparms(file); 3448 3448 3449 - if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) 3449 + if (file->f_op->splice_read && 3450 + test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) 3450 3451 nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount); 3451 3452 else 3452 3453 nfserr = nfsd4_encode_readv(resp, read, file, maxcount);