3 files changed, 37 insertions, 32 deletions

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 3fa1f3d90ce0..99e3e50b5c57 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -197,6 +197,11 @@ struct dm_target {
          * whether or not its underlying devices have support.
          */
         unsigned discards_supported:1;
+
+        /*
+         * Set if this target does not return zeroes on discarded blocks.
+         */
+        unsigned discard_zeroes_data_unsupported:1;
 };
 
 /* Each target can link one of these into the table */
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 1aaf915656f3..8fa4430f99c1 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -900,6 +900,7 @@ struct netns_ipvs {
         volatile int            sync_state;
         volatile int            master_syncid;
         volatile int            backup_syncid;
+        struct mutex            sync_mutex;
         /* multicast interface name */
         char                    master_mcast_ifn[IP_VS_IFNAME_MAXLEN];
         char                    backup_mcast_ifn[IP_VS_IFNAME_MAXLEN];
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 673a024c6b2a..5f097ca7d5c5 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -66,40 +66,34 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh)
         return 0;
 }
 
-static inline int udplite_sender_cscov(struct udp_sock *up, struct udphdr *uh)
+/* Slow-path computation of checksum. Socket is locked. */
+static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
 {
+        const struct udp_sock *up = udp_sk(skb->sk);
         int cscov = up->len;
+        __wsum csum = 0;
 
-        /*
-         * Sender has set `partial coverage' option on UDP-Lite socket
-         */
-        if (up->pcflag & UDPLITE_SEND_CC)    {
+        if (up->pcflag & UDPLITE_SEND_CC) {
+                /*
+                 * Sender has set `partial coverage' option on UDP-Lite socket.
+                 * The special case "up->pcslen == 0" signifies full coverage.
+                 */
                 if (up->pcslen < up->len) {
-                /* up->pcslen == 0 means that full coverage is required,
-                 * partial coverage only if  0 < up->pcslen < up->len */
-                        if (0 < up->pcslen) {
-                               cscov = up->pcslen;
-                        }
-                        uh->len = htons(up->pcslen);
+                        if (0 < up->pcslen)
+                                cscov = up->pcslen;
+                        udp_hdr(skb)->len = htons(up->pcslen);
                 }
-        /*
-         * NOTE: Causes for the error case  `up->pcslen > up->len':
-         *        (i)  Application error (will not be penalized).
-         *       (ii)  Payload too big for send buffer: data is split
-         *             into several packets, each with its own header.
-         *             In this case (e.g. last segment), coverage may
-         *             exceed packet length.
-         *       Since packets with coverage length > packet length are
-         *       illegal, we fall back to the defaults here.
-         */
+                /*
+                 * NOTE: Causes for the error case  `up->pcslen > up->len':
+                 *        (i)  Application error (will not be penalized).
+                 *       (ii)  Payload too big for send buffer: data is split
+                 *             into several packets, each with its own header.
+                 *             In this case (e.g. last segment), coverage may
+                 *             exceed packet length.
+                 *       Since packets with coverage length > packet length are
+                 *       illegal, we fall back to the defaults here.
+                 */
         }
-        return cscov;
-}
-
-static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
-{
-        int cscov = udplite_sender_cscov(udp_sk(sk), udp_hdr(skb));
-        __wsum csum = 0;
 
         skb->ip_summed = CHECKSUM_NONE;     /* no HW support for checksumming */
 
@@ -115,16 +109,21 @@ static inline __wsum udplite_csum_outgoing(struct sock *sk, struct sk_buff *skb)
         return csum;
 }
 
+/* Fast-path computation of checksum. Socket may not be locked. */
 static inline __wsum udplite_csum(struct sk_buff *skb)
 {
-        struct sock *sk = skb->sk;
-        int cscov = udplite_sender_cscov(udp_sk(sk), udp_hdr(skb));
+        const struct udp_sock *up = udp_sk(skb->sk);
         const int off = skb_transport_offset(skb);
-        const int len = skb->len - off;
+        int len = skb->len - off;
 
+        if ((up->pcflag & UDPLITE_SEND_CC) && up->pcslen < len) {
+                if (0 < up->pcslen)
+                        len = up->pcslen;
+                udp_hdr(skb)->len = htons(up->pcslen);
+        }
         skb->ip_summed = CHECKSUM_NONE;     /* no HW support for checksumming */
 
-        return skb_checksum(skb, off, min(cscov, len), 0);
+        return skb_checksum(skb, off, len, 0);
 }
 
 extern void     udplite4_register(void);