Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1839998pxb; Fri, 24 Sep 2021 13:13:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEuEYPVG9bmWrBw7hoy58jf+dyFsWxhBTcWIqxxp++P5Cnm1o3Mr6AUeGTOmQulRejwerM X-Received: by 2002:a50:bf4d:: with SMTP id g13mr7130327edk.195.1632514398475; Fri, 24 Sep 2021 13:13:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632514398; cv=none; d=google.com; s=arc-20160816; b=E3d1z+qZa9zGL9fXTfWmWMdyMDCLusiFDu30oSLQSBa/10iab47HF6pA7MRKAIVQJa 1mxZiJMa/+ZMbHBb3GHK9h5mEirAyMh6zm33TK5zs4zv5h9EKyGG+QgTKY5YY0+PgWzA yn0jmMgc36IpTmIeQYVLQmsZKJvZSKfz4gnINs/IhiG/q+Asfzje8rEOiQ4pQDykXUOo 2JMxqT9bZsuTj+Foba2soyURznp05IuCplXFFibFEBoXLsbnInuiQTiGqiIc2GGlKPpV b/De8MiswS6e3xXBJzDRlyi1ubK3tqWxDgIB0gPHcS9NtDTvc2hJwv6f0Z/XAptoBenQ 4TlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JmNfVOVuSlbVl1mJwuITKOelki3aMnUhwbC/6wj7Kpw=; b=yGjSvnAwMnMh6QC7Op7vJxOS6P90Hlway95oO14+RsWT7Wk7YSDPYAsP/SYSC+XQET e+PtmBoiRiENDQb4IAIV0V4G4+ujpTmAhRPQMdg5oNaWGJXSDDzYvNCfAHWaAHg3906g xHASdgyV7M+E5llbGiyaF+vqC/WdYwMW7jmIGQ9vg2iYO8OWep63Otr7iu01HKyhL8Tb +U1daPokndzjA63/5tXILs9LIhRMa0lW7eFBoAn0bSl+dv7i0HStFWL6Ez8acTbjvBcw qSa+zzveXZnQMbF+8RNbAnPCUK0w/7Q3pBLRNlejCeQCx64MHsq8PGQ4+A6k1lHo6qUH AbJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZT3Yz0EU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v2si10543442ejv.739.2021.09.24.13.12.54; Fri, 24 Sep 2021 13:13:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZT3Yz0EU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347072AbhIXNMc (ORCPT + 99 others); Fri, 24 Sep 2021 09:12:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:39694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345876AbhIXNJ2 (ORCPT ); Fri, 24 Sep 2021 09:09:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9D6436124B; Fri, 24 Sep 2021 12:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632488261; bh=zsHgrQP8VyP+M6UnCyKWV7ocM4IH3HxRulpZAUtgcKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZT3Yz0EUJMeCk2eYcd4zmfY3QpJRruaDEzKo+C+CmOZ961PR/wV5iEOhJxmwMVT0J p6vKQ9PSRbd3VYMkCnr3aUKcfT78fpkDHUIYUsI6Lr7LvK8Zz0CvOlm6ONn7k0FKdz 3FpFwlaT8DbGo3gSwXmR6xu3ZbEJICANrRusP2QE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeff Layton , Ilya Dryomov , Sasha Levin Subject: [PATCH 5.10 46/63] ceph: lockdep annotations for try_nonblocking_invalidate Date: Fri, 24 Sep 2021 14:44:46 +0200 Message-Id: <20210924124335.859944295@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924124334.228235870@linuxfoundation.org> References: <20210924124334.228235870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeff Layton [ Upstream commit 3eaf5aa1cfa8c97c72f5824e2e9263d6cc977b03 ] Signed-off-by: Jeff Layton Reviewed-by: Ilya Dryomov Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/caps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index f303e0d87c3f..48ea95b81df8 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1868,6 +1868,8 @@ static u64 __mark_caps_flushing(struct inode *inode, * try to invalidate mapping pages without blocking. */ static int try_nonblocking_invalidate(struct inode *inode) + __releases(ci->i_ceph_lock) + __acquires(ci->i_ceph_lock) { struct ceph_inode_info *ci = ceph_inode(inode); u32 invalidating_gen = ci->i_rdcache_gen; -- 2.33.0