diff for duplicates of <20190108052255.10699-4-deepa.kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8fa3188..33021c3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,19 +1,19 @@ Add new socket timeout options that are y2038 safe. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> -Cc: ccaulfie at redhat.com -Cc: davem at davemloft.net -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: davem@davemloft.net +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 12 +++-- arch/mips/include/uapi/asm/socket.h | 11 ++++- diff --git a/a/content_digest b/N1/content_digest index 426e247..75ad605 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,42 @@ "ref\020190108052255.10699-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH 3/3] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" + "Subject\0[PATCH 3/3] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" "Date\0Mon, 7 Jan 2019 21:22:55 -0800\0" - "To\0cluster-devel.redhat.com\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0netdev@vger.kernel.org" + arnd@arndb.de + y2038@lists.linaro.org + ccaulfie@redhat.com + deller@gmx.de + paulus@samba.org + ralf@linux-mips.org + rth@twiddle.net + cluster-devel@redhat.com + linuxppc-dev@lists.ozlabs.org + linux-alpha@vger.kernel.org + linux-arch@vger.kernel.org + linux-mips@vger.kernel.org + linux-parisc@vger.kernel.org + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "Add new socket timeout options that are y2038 safe.\n" "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: davem at davemloft.net\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: davem@davemloft.net\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 12 +++--\n" " arch/mips/include/uapi/asm/socket.h | 11 ++++-\n" @@ -329,4 +345,4 @@ "-- \n" 2.17.1 -ffab4f50601d1e6c948eceda1a5a7791df1a8fbfdfde0026dc21d6b1b0c5d3db +7de56a653e0ab673ef806ed5da6d231a8fea3675e0f6e30b0c468d8ca6d5ce0d
diff --git a/a/1.txt b/N2/1.txt index 8fa3188..33021c3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,19 +1,19 @@ Add new socket timeout options that are y2038 safe. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> -Cc: ccaulfie at redhat.com -Cc: davem at davemloft.net -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: davem@davemloft.net +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 12 +++-- arch/mips/include/uapi/asm/socket.h | 11 ++++- diff --git a/a/content_digest b/N2/content_digest index 426e247..f7e3a3f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,26 +1,42 @@ "ref\020190108052255.10699-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH 3/3] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" + "Subject\0[PATCH 3/3] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" "Date\0Mon, 7 Jan 2019 21:22:55 -0800\0" - "To\0cluster-devel.redhat.com\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0linux-arch@vger.kernel.org" + linux-parisc@vger.kernel.org + arnd@arndb.de + y2038@lists.linaro.org + netdev@vger.kernel.org + deller@gmx.de + linux-mips@vger.kernel.org + ralf@linux-mips.org + cluster-devel@redhat.com + ccaulfie@redhat.com + paulus@samba.org + linux-alpha@vger.kernel.org + sparclinux@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " rth@twiddle.net\0" "\00:1\0" "b\0" "Add new socket timeout options that are y2038 safe.\n" "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: davem at davemloft.net\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: davem@davemloft.net\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 12 +++--\n" " arch/mips/include/uapi/asm/socket.h | 11 ++++-\n" @@ -329,4 +345,4 @@ "-- \n" 2.17.1 -ffab4f50601d1e6c948eceda1a5a7791df1a8fbfdfde0026dc21d6b1b0c5d3db +69cd9135dc66eb51cd7906e39b9f6f3d8f4cd92f0941a4c36cc68628a7a9e252
diff --git a/a/1.txt b/N3/1.txt index 8fa3188..b75cc4c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -1,19 +1,19 @@ Add new socket timeout options that are y2038 safe. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> -Cc: ccaulfie at redhat.com -Cc: davem at davemloft.net -Cc: deller at gmx.de -Cc: paulus at samba.org -Cc: ralf at linux-mips.org -Cc: rth at twiddle.net -Cc: cluster-devel at redhat.com -Cc: linuxppc-dev at lists.ozlabs.org -Cc: linux-alpha at vger.kernel.org -Cc: linux-arch at vger.kernel.org -Cc: linux-mips at vger.kernel.org -Cc: linux-parisc at vger.kernel.org -Cc: sparclinux at vger.kernel.org +Cc: ccaulfie@redhat.com +Cc: davem@davemloft.net +Cc: deller@gmx.de +Cc: paulus@samba.org +Cc: ralf@linux-mips.org +Cc: rth@twiddle.net +Cc: cluster-devel@redhat.com +Cc: linuxppc-dev@lists.ozlabs.org +Cc: linux-alpha@vger.kernel.org +Cc: linux-arch@vger.kernel.org +Cc: linux-mips@vger.kernel.org +Cc: linux-parisc@vger.kernel.org +Cc: sparclinux@vger.kernel.org --- arch/alpha/include/uapi/asm/socket.h | 12 +++-- arch/mips/include/uapi/asm/socket.h | 11 ++++- @@ -40,7 +40,7 @@ index ea3ba981d8a0..3d800d5d3d5d 100644 -#define SO_SNDTIMEO SO_SNDTIMEO_OLD +#if !defined(__KERNEL__) - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -48,12 +48,12 @@ index ea3ba981d8a0..3d800d5d3d5d 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -72,7 +72,7 @@ index 4dde20d64690..5a7f9010c090 100644 -#define SO_RCVTIMEO SO_RCVTIMEO_OLD -#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -80,12 +80,12 @@ index 4dde20d64690..5a7f9010c090 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -104,7 +104,7 @@ index 546937fa0d8b..bd35de5b4666 100644 -#define SO_RCVTIMEO SO_RCVTIMEO_OLD -#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -112,12 +112,12 @@ index 546937fa0d8b..bd35de5b4666 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -136,7 +136,7 @@ index bdc396211627..5a5b073c3299 100644 -#define SO_RCVTIMEO SO_RCVTIMEO_OLD -#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 + #if __BITS_PER_LONG = 64 #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD #define SO_TIMESTAMPING SO_TIMESTAMPING_OLD @@ -144,12 +144,12 @@ index bdc396211627..5a5b073c3299 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif @@ -183,7 +183,7 @@ index 9e370586fb19..5b4da6eacc9f 100644 -#define SO_RCVTIMEO SO_RCVTIMEO_OLD -#define SO_SNDTIMEO SO_SNDTIMEO_OLD - #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) + #if __BITS_PER_LONG = 64 || (defined(__x86_64__) && defined(__ILP32__)) /* on 64-bit and x32, avoid the ?: operator */ #define SO_TIMESTAMP SO_TIMESTAMP_OLD #define SO_TIMESTAMPNS SO_TIMESTAMPNS_OLD @@ -192,12 +192,12 @@ index 9e370586fb19..5b4da6eacc9f 100644 +#define SO_RCVTIMEO SO_RCVTIMEO_OLD +#define SO_SNDTIMEO SO_SNDTIMEO_OLD #else - #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) - #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) - #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW) + #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW) + #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW) + -+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) -+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) ++#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW) ++#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW) #endif #define SCM_TIMESTAMP SO_TIMESTAMP @@ -249,8 +249,8 @@ index 42914ca3186c..5e1c6dafee65 100644 return 0; } *timeo_p = MAX_SCHEDULE_TIMEOUT; -- if (tv.tv_sec == 0 && tv.tv_usec == 0) -+ if (stv.tv_sec == 0 && stv.tv_usec == 0) +- if (tv.tv_sec = 0 && tv.tv_usec = 0) ++ if (stv.tv_sec = 0 && stv.tv_usec = 0) return 0; - if (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT/HZ - 1)) - *timeo_p = tv.tv_sec * HZ + DIV_ROUND_UP(tv.tv_usec, USEC_PER_SEC / HZ); @@ -265,13 +265,13 @@ index 42914ca3186c..5e1c6dafee65 100644 case SO_RCVTIMEO_OLD: - ret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen); + case SO_RCVTIMEO_NEW: -+ ret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname == SO_RCVTIMEO_OLD); ++ ret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname = SO_RCVTIMEO_OLD); break; case SO_SNDTIMEO_OLD: - ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen); + case SO_SNDTIMEO_NEW: -+ ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname == SO_SNDTIMEO_OLD); ++ ret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname = SO_SNDTIMEO_OLD); break; case SO_ATTACH_FILTER: @@ -289,7 +289,7 @@ index 42914ca3186c..5e1c6dafee65 100644 + case SO_RCVTIMEO_NEW: + lv = sizeof(struct __kernel_sock_timeval); -+ if (sk->sk_rcvtimeo == MAX_SCHEDULE_TIMEOUT) { ++ if (sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT) { + v.stm.tv_sec = 0; + v.stm.tv_usec = 0; + } else { @@ -300,14 +300,14 @@ index 42914ca3186c..5e1c6dafee65 100644 + case SO_SNDTIMEO_OLD: lv = sizeof(struct __kernel_old_timeval); - if (sk->sk_sndtimeo == MAX_SCHEDULE_TIMEOUT) { + if (sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT) { @@ -1244,6 +1271,17 @@ int sock_getsockopt(struct socket *sock, int level, int optname, } break; + case SO_SNDTIMEO_NEW: + lv = sizeof(struct __kernel_sock_timeval); -+ if (sk->sk_sndtimeo == MAX_SCHEDULE_TIMEOUT) { ++ if (sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT) { + v.stm.tv_sec = 0; + v.stm.tv_usec = 0; + } else { diff --git a/a/content_digest b/N3/content_digest index 426e247..c45b0b4 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,26 +1,42 @@ "ref\020190108052255.10699-1-deepa.kernel@gmail.com\0" "From\0Deepa Dinamani <deepa.kernel@gmail.com>\0" - "Subject\0[Cluster-devel] [PATCH 3/3] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" - "Date\0Mon, 7 Jan 2019 21:22:55 -0800\0" - "To\0cluster-devel.redhat.com\0" + "Subject\0[PATCH 3/3] sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW\0" + "Date\0Tue, 08 Jan 2019 05:22:55 +0000\0" + "To\0davem@davemloft.net" + " linux-kernel@vger.kernel.org\0" + "Cc\0netdev@vger.kernel.org" + arnd@arndb.de + y2038@lists.linaro.org + ccaulfie@redhat.com + deller@gmx.de + paulus@samba.org + ralf@linux-mips.org + rth@twiddle.net + cluster-devel@redhat.com + linuxppc-dev@lists.ozlabs.org + linux-alpha@vger.kernel.org + linux-arch@vger.kernel.org + linux-mips@vger.kernel.org + linux-parisc@vger.kernel.org + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "Add new socket timeout options that are y2038 safe.\n" "\n" "Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>\n" - "Cc: ccaulfie at redhat.com\n" - "Cc: davem at davemloft.net\n" - "Cc: deller at gmx.de\n" - "Cc: paulus at samba.org\n" - "Cc: ralf at linux-mips.org\n" - "Cc: rth at twiddle.net\n" - "Cc: cluster-devel at redhat.com\n" - "Cc: linuxppc-dev at lists.ozlabs.org\n" - "Cc: linux-alpha at vger.kernel.org\n" - "Cc: linux-arch at vger.kernel.org\n" - "Cc: linux-mips at vger.kernel.org\n" - "Cc: linux-parisc at vger.kernel.org\n" - "Cc: sparclinux at vger.kernel.org\n" + "Cc: ccaulfie@redhat.com\n" + "Cc: davem@davemloft.net\n" + "Cc: deller@gmx.de\n" + "Cc: paulus@samba.org\n" + "Cc: ralf@linux-mips.org\n" + "Cc: rth@twiddle.net\n" + "Cc: cluster-devel@redhat.com\n" + "Cc: linuxppc-dev@lists.ozlabs.org\n" + "Cc: linux-alpha@vger.kernel.org\n" + "Cc: linux-arch@vger.kernel.org\n" + "Cc: linux-mips@vger.kernel.org\n" + "Cc: linux-parisc@vger.kernel.org\n" + "Cc: sparclinux@vger.kernel.org\n" "---\n" " arch/alpha/include/uapi/asm/socket.h | 12 +++--\n" " arch/mips/include/uapi/asm/socket.h | 11 ++++-\n" @@ -47,7 +63,7 @@ "-#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" "+#if !defined(__KERNEL__)\n" " \n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" " #define SO_TIMESTAMPING\tSO_TIMESTAMPING_OLD\n" @@ -55,12 +71,12 @@ "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -79,7 +95,7 @@ " \n" "-#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "-#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" " #define SO_TIMESTAMPING\tSO_TIMESTAMPING_OLD\n" @@ -87,12 +103,12 @@ "+#define SO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define SO_SNDTIMEO SO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -111,7 +127,7 @@ " \n" "-#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "-#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" " #define SO_TIMESTAMPING\tSO_TIMESTAMPING_OLD\n" @@ -119,12 +135,12 @@ "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -143,7 +159,7 @@ " \n" "-#define\tSO_RCVTIMEO\tSO_RCVTIMEO_OLD\n" "-#define\tSO_SNDTIMEO\tSO_SNDTIMEO_OLD\n" - " #if __BITS_PER_LONG == 64\n" + " #if __BITS_PER_LONG = 64\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" " #define SO_TIMESTAMPING\tSO_TIMESTAMPING_OLD\n" @@ -151,12 +167,12 @@ "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " \n" @@ -190,7 +206,7 @@ " \n" "-#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "-#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" - " #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))\n" + " #if __BITS_PER_LONG = 64 || (defined(__x86_64__) && defined(__ILP32__))\n" " /* on 64-bit and x32, avoid the ?: operator */\n" " #define SO_TIMESTAMP\t\tSO_TIMESTAMP_OLD\n" " #define SO_TIMESTAMPNS\t\tSO_TIMESTAMPNS_OLD\n" @@ -199,12 +215,12 @@ "+#define\tSO_RCVTIMEO SO_RCVTIMEO_OLD\n" "+#define\tSO_SNDTIMEO SO_SNDTIMEO_OLD\n" " #else\n" - " #define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" - " #define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" - " #define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" + " #define SO_TIMESTAMP (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)\n" + " #define SO_TIMESTAMPNS (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)\n" + " #define SO_TIMESTAMPING (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)\n" "+\n" - "+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" - "+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" + "+#define SO_RCVTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)\n" + "+#define SO_SNDTIMEO (sizeof(time_t) = sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)\n" " #endif\n" " \n" " #define SCM_TIMESTAMP SO_TIMESTAMP\n" @@ -256,8 +272,8 @@ " \t\treturn 0;\n" " \t}\n" " \t*timeo_p = MAX_SCHEDULE_TIMEOUT;\n" - "-\tif (tv.tv_sec == 0 && tv.tv_usec == 0)\n" - "+\tif (stv.tv_sec == 0 && stv.tv_usec == 0)\n" + "-\tif (tv.tv_sec = 0 && tv.tv_usec = 0)\n" + "+\tif (stv.tv_sec = 0 && stv.tv_usec = 0)\n" " \t\treturn 0;\n" "-\tif (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT/HZ - 1))\n" "-\t\t*timeo_p = tv.tv_sec * HZ + DIV_ROUND_UP(tv.tv_usec, USEC_PER_SEC / HZ);\n" @@ -272,13 +288,13 @@ " \tcase SO_RCVTIMEO_OLD:\n" "-\t\tret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen);\n" "+\tcase SO_RCVTIMEO_NEW:\n" - "+\t\tret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname == SO_RCVTIMEO_OLD);\n" + "+\t\tret = sock_set_timeout(&sk->sk_rcvtimeo, optval, optlen, optname = SO_RCVTIMEO_OLD);\n" " \t\tbreak;\n" " \n" " \tcase SO_SNDTIMEO_OLD:\n" "-\t\tret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen);\n" "+\tcase SO_SNDTIMEO_NEW:\n" - "+\t\tret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname == SO_SNDTIMEO_OLD);\n" + "+\t\tret = sock_set_timeout(&sk->sk_sndtimeo, optval, optlen, optname = SO_SNDTIMEO_OLD);\n" " \t\tbreak;\n" " \n" " \tcase SO_ATTACH_FILTER:\n" @@ -296,7 +312,7 @@ " \n" "+\tcase SO_RCVTIMEO_NEW:\n" "+\t\tlv = sizeof(struct __kernel_sock_timeval);\n" - "+\t\tif (sk->sk_rcvtimeo == MAX_SCHEDULE_TIMEOUT) {\n" + "+\t\tif (sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT) {\n" "+\t\t\tv.stm.tv_sec = 0;\n" "+\t\t\tv.stm.tv_usec = 0;\n" "+\t\t} else {\n" @@ -307,14 +323,14 @@ "+\n" " \tcase SO_SNDTIMEO_OLD:\n" " \t\tlv = sizeof(struct __kernel_old_timeval);\n" - " \t\tif (sk->sk_sndtimeo == MAX_SCHEDULE_TIMEOUT) {\n" + " \t\tif (sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT) {\n" "@@ -1244,6 +1271,17 @@ int sock_getsockopt(struct socket *sock, int level, int optname,\n" " \t\t}\n" " \t\tbreak;\n" " \n" "+\tcase SO_SNDTIMEO_NEW:\n" "+\t\tlv = sizeof(struct __kernel_sock_timeval);\n" - "+\t\tif (sk->sk_sndtimeo == MAX_SCHEDULE_TIMEOUT) {\n" + "+\t\tif (sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT) {\n" "+\t\t\tv.stm.tv_sec = 0;\n" "+\t\t\tv.stm.tv_usec = 0;\n" "+\t\t} else {\n" @@ -329,4 +345,4 @@ "-- \n" 2.17.1 -ffab4f50601d1e6c948eceda1a5a7791df1a8fbfdfde0026dc21d6b1b0c5d3db +486bdf2d5b667b453bf364975bc7edbf51f65245dd6e5682a0f1252f7eb802d2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.