From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3898BC433F8 for ; Mon, 20 Jul 2020 16:16:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E11B206F2 for ; Mon, 20 Jul 2020 16:16:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261763; bh=kg2cfYSlACz1h2UN+y3/6qgPaDJ7uw3fZNv6Tmy/Qzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pBH0F+vRPPyrjHfc0sxqIHGv1+X5JgtK3RM+31EHrtQSjSZsU/ffS3FnDgbycSwmz eW2ttnIZADOkS8nXjDD25GB2oovcPFWWXyYwN9nENdNVfh6Bb+BZTmqDonJNuqR3nB 9soD8M0/AyKppi9AySiyMeK9R7EDinWV+ywZ6YMQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388474AbgGTQQC (ORCPT ); Mon, 20 Jul 2020 12:16:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:57078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388490AbgGTQQB (ORCPT ); Mon, 20 Jul 2020 12:16:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D3792176B; Mon, 20 Jul 2020 16:16:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261761; bh=kg2cfYSlACz1h2UN+y3/6qgPaDJ7uw3fZNv6Tmy/Qzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hhXjQyHDKmYfDgL7qqp820T5FA0KVAG/bUBr7qTTGKDX7eTLfXPfe3SSFI3q++ca2 sp57rgvwdtgxhmqBJwHJ2inVN2cHFiYEez7OL1JDubSqMsUaR005G7+LSyZRhSJoUj R5ShhQ9kTg5FU/hIGtRNtBz3MZfr6hK+tLYSKfvg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Dryomov , Jeff Layton Subject: [PATCH 5.7 232/244] libceph: dont omit recovery_deletes in target_copy() Date: Mon, 20 Jul 2020 17:38:23 +0200 Message-Id: <20200720152836.878557848@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152825.863040590@linuxfoundation.org> References: <20200720152825.863040590@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 @@ -445,6 +445,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;