new helper: msg_data_left()

convert open-coded instances

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 094a6822c71d..18e3a12eb1b2 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1119,7 +1119,7 @@ int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
 
         sg = !!(sk->sk_route_caps & NETIF_F_SG);
 
-        while (iov_iter_count(&msg->msg_iter)) {
+        while (msg_data_left(msg)) {
                 int copy = 0;
                 int max = size_goal;
 
@@ -1163,8 +1163,8 @@ new_segment:
                 }
 
                 /* Try to append data to the end of skb. */
-                if (copy > iov_iter_count(&msg->msg_iter))
-                        copy = iov_iter_count(&msg->msg_iter);
+                if (copy > msg_data_left(msg))
+                        copy = msg_data_left(msg);
 
                 /* Where to copy to? */
                 if (skb_availroom(skb) > 0) {
@@ -1221,7 +1221,7 @@ new_segment:
                 tcp_skb_pcount_set(skb, 0);
 
                 copied += copy;
-                if (!iov_iter_count(&msg->msg_iter)) {
+                if (!msg_data_left(msg)) {
                         tcp_tx_timestamp(sk, skb);
                         goto out;
                 }