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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 267C5C43381 for ; Fri, 22 Mar 2019 11:27:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB8FA218A2 for ; Fri, 22 Mar 2019 11:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254033; bh=RTuBY2d7Uy+/xT78D2ezwmqG8XQJUYs8Wp7Kv4Wv8OA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZAcPQq7D0mwWqhT9werzkMqY/QCKGpIrKn2YjfxD9L695XqYkQHaZrcce2uZUWogr f9lju7J81boyqfjZQR1huTKbxwPCLDocUFOnU6ozkdF8veLHwgTOc3is9y0gOmDqDg z4JyOibsARy6W+a7OueNRaXTkcHhJWu5QGhji83Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729517AbfCVL1L (ORCPT ); Fri, 22 Mar 2019 07:27:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:54838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729506AbfCVL1F (ORCPT ); Fri, 22 Mar 2019 07:27:05 -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 7793620657; Fri, 22 Mar 2019 11:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254025; bh=RTuBY2d7Uy+/xT78D2ezwmqG8XQJUYs8Wp7Kv4Wv8OA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QxydTEIlLoVm6zh+PrKyYqrDoiuk8R0BIMJ/CWp4A7G3+Y0HgiTJVO387zIHIPCM/ huaVj3w8MeaatuwTTeyK4Jrxwy8vjjYAMY3/KrsNRuKMNF6ex30z/46Oc4U7TLtXKW fhkmoa/XsbJDXr6YigcPBewuBxtoulZVkHyd2sgE= 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.4 001/230] ceph: avoid repeatedly adding inode to mdsc->snap_flush_list Date: Fri, 22 Mar 2019 12:12:19 +0100 Message-Id: <20190322111236.893022505@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@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.4-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 @@ -611,7 +611,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 */ }