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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 033C5C433EF for ; Mon, 13 Sep 2021 22:37:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E182B60E8B for ; Mon, 13 Sep 2021 22:37:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349360AbhIMWjM (ORCPT ); Mon, 13 Sep 2021 18:39:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:51910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348545AbhIMWhJ (ORCPT ); Mon, 13 Sep 2021 18:37:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 96FFC61222; Mon, 13 Sep 2021 22:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572511; bh=LlZl4uotdXTLcazj5ABksNCOpYWPlfmtfApMEEoTKeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MGmS9wFgrDW/uT2zEjEuU7LFl7idfDfy+GdRAnXjvBYU3LmDN7bauwqrgv46W4LUk zyAzJFXWQlzLS5auZ3nVhFlC7jp4vDu7PFWFg9+N0P/Q8IhZiV1bwre83g6HfKwTs9 y4sk6yUMPNh7tWvOIUMrx+hek3HfDVGyjDf/4mV30v2snk+cUA6bwkbOlDQSEyXhDM mV1Y7U0Do5XQXLR5OpWJdYCI2p9UuQI5IAxud4kuhZ7IT+jJ3ziec2sDm3F9yUgykQ IdvO+oI++ou7qSi/PX2GFNNid8U0UOUHlVKwvt5VscDwe/YTd8DgBs4ZcsgspAmVsE Bcj/Zm7Js2otA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeff Layton , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 05/12] ceph: lockdep annotations for try_nonblocking_invalidate Date: Mon, 13 Sep 2021 18:34:57 -0400 Message-Id: <20210913223504.436087-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223504.436087-1-sashal@kernel.org> References: <20210913223504.436087-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: ceph-devel@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 a49bf1fbaea8..0fad044a5752 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1775,6 +1775,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.30.2