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

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Pull rdma fix from Jason Gunthorpe:
"Single fix to correct the iov_iter construction in soft iwarp. This
avoids blktest crashes with recent changes to the allocators"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/siw: Fix the sendmsg byte count in siw_tcp_sendpages

+2 -3
+2 -3
drivers/infiniband/sw/siw/siw_qp_tx.c
··· 340 340 if (!sendpage_ok(page[i])) 341 341 msg.msg_flags &= ~MSG_SPLICE_PAGES; 342 342 bvec_set_page(&bvec, page[i], bytes, offset); 343 - iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size); 343 + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, bytes); 344 344 345 345 try_page_again: 346 346 lock_sock(sk); 347 - rv = tcp_sendmsg_locked(sk, &msg, size); 347 + rv = tcp_sendmsg_locked(sk, &msg, bytes); 348 348 release_sock(sk); 349 349 350 350 if (rv > 0) { 351 351 size -= rv; 352 352 sent += rv; 353 353 if (rv != bytes) { 354 - offset += rv; 355 354 bytes -= rv; 356 355 goto try_page_again; 357 356 }