From: Greg Kroah-Hartman Date: Mon, 20 Jul 2020 13:28:01 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.4.231~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9d31b87333d8e64286892abc61243ec4d709655;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: libceph-don-t-omit-recovery_deletes-in-target_copy.patch rxrpc-fix-trace-string.patch --- diff --git a/queue-4.14/libceph-don-t-omit-recovery_deletes-in-target_copy.patch b/queue-4.14/libceph-don-t-omit-recovery_deletes-in-target_copy.patch new file mode 100644 index 00000000000..705b670c786 --- /dev/null +++ b/queue-4.14/libceph-don-t-omit-recovery_deletes-in-target_copy.patch @@ -0,0 +1,32 @@ +From 2f3fead62144002557f322c2a7c15e1255df0653 Mon Sep 17 00:00:00 2001 +From: Ilya Dryomov +Date: Tue, 9 Jun 2020 11:57:56 +0200 +Subject: libceph: don't omit recovery_deletes in target_copy() + +From: Ilya Dryomov + +commit 2f3fead62144002557f322c2a7c15e1255df0653 upstream. + +Currently target_copy() is used only for sending linger pings, so +this doesn't come up, but generally omitting recovery_deletes can +result in unneeded resends (force_resend in calc_target()). + +Fixes: ae78dd8139ce ("libceph: make RECOVERY_DELETES feature create a new interval") +Signed-off-by: Ilya Dryomov +Reviewed-by: Jeff Layton +Signed-off-by: Greg Kroah-Hartman + +--- + net/ceph/osd_client.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/ceph/osd_client.c ++++ b/net/ceph/osd_client.c +@@ -384,6 +384,7 @@ static void target_copy(struct ceph_osd_ + dest->size = src->size; + dest->min_size = src->min_size; + dest->sort_bitwise = src->sort_bitwise; ++ dest->recovery_deletes = src->recovery_deletes; + + dest->flags = src->flags; + dest->paused = src->paused; diff --git a/queue-4.14/rxrpc-fix-trace-string.patch b/queue-4.14/rxrpc-fix-trace-string.patch new file mode 100644 index 00000000000..22f1c6009f4 --- /dev/null +++ b/queue-4.14/rxrpc-fix-trace-string.patch @@ -0,0 +1,34 @@ +From aadf9dcef9d4cd68c73a4ab934f93319c4becc47 Mon Sep 17 00:00:00 2001 +From: David Howells +Date: Wed, 17 Jun 2020 22:50:33 +0100 +Subject: rxrpc: Fix trace string + +From: David Howells + +commit aadf9dcef9d4cd68c73a4ab934f93319c4becc47 upstream. + +The trace symbol printer (__print_symbolic()) ignores symbols that map to +an empty string and prints the hex value instead. + +Fix the symbol for rxrpc_cong_no_change to " -" instead of "" to avoid +this. + +Fixes: b54a134a7de4 ("rxrpc: Fix handling of enums-to-string translation in tracing") +Signed-off-by: David Howells +Signed-off-by: Greg Kroah-Hartman + +--- + include/trace/events/rxrpc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/trace/events/rxrpc.h ++++ b/include/trace/events/rxrpc.h +@@ -333,7 +333,7 @@ enum rxrpc_congest_change { + EM(rxrpc_cong_begin_retransmission, " Retrans") \ + EM(rxrpc_cong_cleared_nacks, " Cleared") \ + EM(rxrpc_cong_new_low_nack, " NewLowN") \ +- EM(rxrpc_cong_no_change, "") \ ++ EM(rxrpc_cong_no_change, " -") \ + EM(rxrpc_cong_progress, " Progres") \ + EM(rxrpc_cong_retransmit_again, " ReTxAgn") \ + EM(rxrpc_cong_rtt_window_end, " RttWinE") \ diff --git a/queue-4.14/series b/queue-4.14/series index 81efc9de6ae..72b13b282ed 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -122,3 +122,5 @@ thermal-drivers-cpufreq_cooling-fix-wrong-frequency-converted-from-power.patch arm64-ptrace-override-spsr.ss-when-single-stepping-is-enabled.patch sched-fair-handle-case-of-task_h_load-returning-0.patch x86-cpu-move-x86_cache_bits-settings.patch +libceph-don-t-omit-recovery_deletes-in-target_copy.patch +rxrpc-fix-trace-string.patch