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=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 59EE2C433EF for ; Fri, 24 Sep 2021 12:44:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 448AB6124D for ; Fri, 24 Sep 2021 12:44:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343796AbhIXMqE (ORCPT ); Fri, 24 Sep 2021 08:46:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:41372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343758AbhIXMqA (ORCPT ); Fri, 24 Sep 2021 08:46:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0798C61107; Fri, 24 Sep 2021 12:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632487467; bh=a6AuxuqVS/i0JKQgCn3ufI/cMB/h6dwJ29aI3hvIt24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YPXFOgnWevM1pqWli8cVsXgmj/Nj1FL9nTm/G/bCiHAN8hIjHmN0fio8Pn1ZviRcM rpthcRfASSzsiEr4Ii4pjv+kH5CXxhz8JIsbwzi9bStugMBV31ps5mzLAVgpRIONKB cRCsTvuQmboniRpjeqm5iJuX9KcpwWNGYq1GF0w0= 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 4.4 14/23] ceph: lockdep annotations for try_nonblocking_invalidate Date: Fri, 24 Sep 2021 14:43:55 +0200 Message-Id: <20210924124328.280807956@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924124327.816210800@linuxfoundation.org> References: <20210924124327.816210800@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: 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 9d74cd37b395..154c47282a34 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1545,6 +1545,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.33.0