diff for duplicates of <52C6D6E9.3060203@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 857cbfd..87e0aef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > +++ b/net/sctp/socket.c > @@ -2579,8 +2579,10 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, > return 0; -> } else if (optlen = sizeof(struct sctp_assoc_value)) { +> } else if (optlen == sizeof(struct sctp_assoc_value)) { > pr_warn_ratelimited(DEPRECATED > + "%s (%d) " > "Use of struct sctp_assoc_value in delayed_ack socket option.\n" @@ -45,7 +45,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > > @@ -2996,8 +2998,10 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned > -> if (optlen = sizeof(int)) { +> if (optlen == sizeof(int)) { > pr_warn_ratelimited(DEPRECATED > + "%s (%d) " > "Use of int in maxseg socket option.\n" @@ -57,7 +57,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > params.assoc_id = 0; > @@ -3255,8 +3259,10 @@ static int sctp_setsockopt_maxburst(struct sock *sk, > -> if (optlen = sizeof(int)) { +> if (optlen == sizeof(int)) { > pr_warn_ratelimited(DEPRECATED > + "%s (%d) " > "Use of int in max_burst socket option deprecated.\n" @@ -66,10 +66,10 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > + current->comm, task_pid_nr(current)); > if (copy_from_user(&val, optval, optlen)) > return -EFAULT; -> } else if (optlen = sizeof(struct sctp_assoc_value)) { +> } else if (optlen == sizeof(struct sctp_assoc_value)) { > @@ -4577,8 +4583,10 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len, > return -EFAULT; -> } else if (len = sizeof(struct sctp_assoc_value)) { +> } else if (len == sizeof(struct sctp_assoc_value)) { > pr_warn_ratelimited(DEPRECATED > + "%s (%d) " > "Use of struct sctp_assoc_value in delayed_ack socket option.\n" @@ -81,7 +81,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > } else > @@ -5223,8 +5231,10 @@ static int sctp_getsockopt_maxseg(struct sock *sk, int len, > -> if (len = sizeof(int)) { +> if (len == sizeof(int)) { > pr_warn_ratelimited(DEPRECATED > + "%s (%d) " > "Use of int in maxseg socket option.\n" @@ -93,7 +93,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > len = sizeof(struct sctp_assoc_value); > @@ -5316,8 +5326,10 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len, > -> if (len = sizeof(int)) { +> if (len == sizeof(int)) { > pr_warn_ratelimited(DEPRECATED > + "%s (%d) " > "Use of int in max_burst socket option.\n" diff --git a/a/content_digest b/N1/content_digest index e66e2b0..a622f9d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01388695167-21896-1-git-send-email-nhorman@tuxdriver.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH v2] sctp: Add process name and pid to deprecation warnings\0" - "Date\0Fri, 03 Jan 2014 15:27:37 +0000\0" + "Date\0Fri, 03 Jan 2014 10:27:37 -0500\0" "To\0Neil Horman <nhorman@tuxdriver.com>" " linux-sctp@vger.kernel.org\0" "Cc\0Ben Hutchings <bhutchings@solarflare.com>" @@ -45,7 +45,7 @@ "> +++ b/net/sctp/socket.c\n" "> @@ -2579,8 +2579,10 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk,\n" "> \t\t\treturn 0;\n" - "> \t} else if (optlen = sizeof(struct sctp_assoc_value)) {\n" + "> \t} else if (optlen == sizeof(struct sctp_assoc_value)) {\n" "> \t\tpr_warn_ratelimited(DEPRECATED\n" "> +\t\t\t\t \"%s (%d) \"\n" "> \t\t\t\t \"Use of struct sctp_assoc_value in delayed_ack socket option.\\n\"\n" @@ -57,7 +57,7 @@ "> \n" "> @@ -2996,8 +2998,10 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned\n" "> \n" - "> \tif (optlen = sizeof(int)) {\n" + "> \tif (optlen == sizeof(int)) {\n" "> \t\tpr_warn_ratelimited(DEPRECATED\n" "> +\t\t\t\t \"%s (%d) \"\n" "> \t\t\t\t \"Use of int in maxseg socket option.\\n\"\n" @@ -69,7 +69,7 @@ "> \t\tparams.assoc_id = 0;\n" "> @@ -3255,8 +3259,10 @@ static int sctp_setsockopt_maxburst(struct sock *sk,\n" "> \n" - "> \tif (optlen = sizeof(int)) {\n" + "> \tif (optlen == sizeof(int)) {\n" "> \t\tpr_warn_ratelimited(DEPRECATED\n" "> +\t\t\t\t \"%s (%d) \"\n" "> \t\t\t\t \"Use of int in max_burst socket option deprecated.\\n\"\n" @@ -78,10 +78,10 @@ "> +\t\t\t\t current->comm, task_pid_nr(current));\n" "> \t\tif (copy_from_user(&val, optval, optlen))\n" "> \t\t\treturn -EFAULT;\n" - "> \t} else if (optlen = sizeof(struct sctp_assoc_value)) {\n" + "> \t} else if (optlen == sizeof(struct sctp_assoc_value)) {\n" "> @@ -4577,8 +4583,10 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,\n" "> \t\t\treturn -EFAULT;\n" - "> \t} else if (len = sizeof(struct sctp_assoc_value)) {\n" + "> \t} else if (len == sizeof(struct sctp_assoc_value)) {\n" "> \t\tpr_warn_ratelimited(DEPRECATED\n" "> +\t\t\t\t \"%s (%d) \"\n" "> \t\t\t\t \"Use of struct sctp_assoc_value in delayed_ack socket option.\\n\"\n" @@ -93,7 +93,7 @@ "> \t} else\n" "> @@ -5223,8 +5231,10 @@ static int sctp_getsockopt_maxseg(struct sock *sk, int len,\n" "> \n" - "> \tif (len = sizeof(int)) {\n" + "> \tif (len == sizeof(int)) {\n" "> \t\tpr_warn_ratelimited(DEPRECATED\n" "> +\t\t\t\t \"%s (%d) \"\n" "> \t\t\t\t \"Use of int in maxseg socket option.\\n\"\n" @@ -105,7 +105,7 @@ "> \t\tlen = sizeof(struct sctp_assoc_value);\n" "> @@ -5316,8 +5326,10 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len,\n" "> \n" - "> \tif (len = sizeof(int)) {\n" + "> \tif (len == sizeof(int)) {\n" "> \t\tpr_warn_ratelimited(DEPRECATED\n" "> +\t\t\t\t \"%s (%d) \"\n" "> \t\t\t\t \"Use of int in max_burst socket option.\\n\"\n" @@ -117,4 +117,4 @@ "> \t\tlen = sizeof(struct sctp_assoc_value);\n" > -083e233c6da815a2de1f3fb931a5498a86924c74b5cb0acac995a6ee5e2af6c1 +4807b5a1dce29a677884a856a23247701e482aad8325052c3947cbed1cbb361d
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.