From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 9 Jun 2020 09:57:56 +0000 (+0200)
Subject: libceph: don't omit recovery_deletes in target_copy()
X-Git-Tag: v4.14.189~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=476f9cdeef69b024ed7e8f6060533bf2e04e03ef;p=users%2Fdwmw2%2Flinux.git

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 753cbfd32dab3..b026128a89d76 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -384,6 +384,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;