summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2020-06-09 11:57:56 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-22 09:32:13 +0200
commit4cb7718803af0c615b8d71d17e64b83759930c35 (patch)
tree1881dde50a925b149af324c48f398af9ee24ddf3 /net
parentcaffd39d4f15810c653fa8686aaf43c11c18d854 (diff)
downloadlinux-stable-4cb7718803af0c615b8d71d17e64b83759930c35.tar.gz
linux-stable-4cb7718803af0c615b8d71d17e64b83759930c35.tar.bz2
linux-stable-4cb7718803af0c615b8d71d17e64b83759930c35.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/osd_client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index b8c4aea42917..713fe1fbcb18 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -442,6 +442,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;