Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp4912156imc; Mon, 25 Feb 2019 13:29:20 -0800 (PST) X-Google-Smtp-Source: AHgI3IamTFVDa/ogPkEBnfYXz6jkgbU7z2fsAiHn/A/y7LUBURW1Z3O0kXHCYBB7LPd6vHXw/nrs X-Received: by 2002:a17:902:8e82:: with SMTP id bg2mr22453695plb.217.1551130160181; Mon, 25 Feb 2019 13:29:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551130160; cv=none; d=google.com; s=arc-20160816; b=F/Q+7VH6AXKQDqARXeaUPwWVzA+jj7LflRNQQaerIh1UtQhsfXCk/8Napcozvk37Wa LXRM2jNzbftKbRQQIjW8xRdwaZ1koVv7AUvJ4KFMH8mP9AP6ByYvQ/wth1j6a0znfAG9 zpYuGIDWd5DL7m6UshEYEslyHjMQcq26+nv92/RCEsiytrgYxkczBwQr9LRjJpkoZ92o ivAfuFvrDnD15I1F+tnJYzucR9qvYKUhPMhshhDYGGuHUCm3Hc02766A227RAHmx+PNY JWLjcvQSYF8YUmcEl74A2iqmr5ZOHGApoZkn4M+kZUv79gAe8oByZ3khMM8NUd3aPHE6 gcrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MPH/AWRbimt1iJOUzzA+iFmaczIz5iHLjzjp9svC8fE=; b=D8IePzMa6cvp/d5w49mWDmak6MR7iFsLci+AEIwz2wHLO4BtkB/tVAynC1xU+NDtsR rVwtUNII/FhaXIPBh4OqZ6Lir66+7IO1J+RUrgpS/nOy1hqlhrSw9G9A16Tewhg4o9fR 3+kQo+ppsvx+TTRsq59AyCxmx2AsO/iLpH//i3a5/l9nDtwYD9c4nxlVxSMlCGuV2LdU Y95/yiTtK1PfffBqeWQtXBEAQpUvM4T5QvghTTfXeX8oVGYcdr6TwWU8kdirP1przQp+ cp92YFtmLYAIfq1Wwdix1RWwXdJHErs+rPsqTV3TQFjSAeUmBGc2i+EBfFpu6gVY1Mhc FV+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Eeytoi8y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n20si10780507pgk.325.2019.02.25.13.29.05; Mon, 25 Feb 2019 13:29:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Eeytoi8y; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729106AbfBYV2Y (ORCPT + 99 others); Mon, 25 Feb 2019 16:28:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:34050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731818AbfBYV2P (ORCPT ); Mon, 25 Feb 2019 16:28:15 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 6B5532084D; Mon, 25 Feb 2019 21:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130094; bh=6reO+Yyop2P70NTsb/K8RHdFJsty+To66rzOgTG/OcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Eeytoi8yyrmwJPgwkLN65i3LFHNPvg/jrjLY6BcfFetdpIktMqBrhGXLVODNDNaX4 eEvdJvJGz9M7lhRcdIoyJfMeol+JN6RC3eyJOlsraveuViaYxRE25WglSG+D48hgA0 0XBfPjOrYyNJQLtT8vepGZFKAjx0bPpfA0wukzuQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Yan, Zheng" , Ilya Dryomov Subject: [PATCH 4.20 013/183] ceph: avoid repeatedly adding inode to mdsc->snap_flush_list Date: Mon, 25 Feb 2019 22:09:46 +0100 Message-Id: <20190225195056.893530517@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yan, Zheng commit 04242ff3ac0abbaa4362f97781dac268e6c3541a upstream. Otherwise, mdsc->snap_flush_list may get corrupted. Cc: stable@vger.kernel.org Signed-off-by: "Yan, Zheng" Reviewed-by: Ilya Dryomov Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- fs/ceph/snap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -616,7 +616,8 @@ int __ceph_finish_cap_snap(struct ceph_i capsnap->size); spin_lock(&mdsc->snap_flush_lock); - list_add_tail(&ci->i_snap_flush_item, &mdsc->snap_flush_list); + if (list_empty(&ci->i_snap_flush_item)) + list_add_tail(&ci->i_snap_flush_item, &mdsc->snap_flush_list); spin_unlock(&mdsc->snap_flush_lock); return 1; /* caller may want to ceph_flush_snaps */ }