| From 2f3fead62144002557f322c2a7c15e1255df0653 Mon Sep 17 00:00:00 2001 |
| From: Ilya Dryomov <idryomov@gmail.com> |
| Date: Tue, 9 Jun 2020 11:57:56 +0200 |
| Subject: [PATCH] libceph: don't omit recovery_deletes in target_copy() |
| |
| 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 <idryomov@gmail.com> |
| Reviewed-by: Jeff Layton <jlayton@kernel.org> |
| |
| diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c |
| index a37d159019a0..8f7fbe861dff 100644 |
| --- a/net/ceph/osd_client.c |
| +++ b/net/ceph/osd_client.c |
| @@ -445,6 +445,7 @@ static void target_copy(struct ceph_osd_request_target *dest, |
| 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; |
| -- |
| 2.27.0 |
| |