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 BD59CC433EF for ; Mon, 13 Sep 2021 22:40:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A296C610F9 for ; Mon, 13 Sep 2021 22:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348345AbhIMWlc (ORCPT ); Mon, 13 Sep 2021 18:41:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:51262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349401AbhIMWj3 (ORCPT ); Mon, 13 Sep 2021 18:39:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF97861359; Mon, 13 Sep 2021 22:35:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572553; bh=wONYPr1iARhFTkx5Qms6LfW3HU9ee554V1WrHB3zeRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tf3JH2UHBd/7fXi2rKEhERd8wZTC6Liv1IEFBCZfOg8dvU8CMj9ivXCaiR6jdhmB6 JzH8y/Coc1Vww/nVBDKmAeyALmMoN4hJdhZyiaGsclVMRRMN3Wu9gtwsFbIFvLffnk lQHO9k3Zy7i7ZVlS+cqjv5xgBT2DhbR9Bjox25gut+7ulzOL7atNB4ERVmUZIxWKYa 0e49AGP+olgUlXJXrlRIkacTZjcvOebebMIBXt1i3W9p2u9ixSW9usALPzBYlxxui7 lKf55Gem3Pe0DSopyvRsgIk/kJ/SOq5tywHTE8+qNM/Eg7NLwfSoJX9g65R9HRIuuH TVFtchs6SwoUQ== 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 4.9 3/9] ceph: lockdep annotations for try_nonblocking_invalidate Date: Mon, 13 Sep 2021 18:35:43 -0400 Message-Id: <20210913223549.436541-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223549.436541-1-sashal@kernel.org> References: <20210913223549.436541-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: stable@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 0eb2ada032c7..839bccbcc9d6 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1572,6 +1572,8 @@ static int __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