Takashi Iwai f16f5f
From 31db9b13e54e52693870ed5fb6755fcd829bfc68 Mon Sep 17 00:00:00 2001
Takashi Iwai f16f5f
From: Jeff Layton <jlayton@kernel.org>
Takashi Iwai f16f5f
Date: Thu, 2 Sep 2021 08:31:03 -0400
Takashi Iwai f16f5f
Subject: [PATCH] ceph: lockdep annotations for try_nonblocking_invalidate
Takashi Iwai f16f5f
Git-commit: 3eaf5aa1cfa8c97c72f5824e2e9263d6cc977b03
Takashi Iwai f16f5f
Patch-mainline: v5.15-rc1
Takashi Iwai f16f5f
References: stable-5.14.8
Takashi Iwai f16f5f
Takashi Iwai f16f5f
[ Upstream commit 3eaf5aa1cfa8c97c72f5824e2e9263d6cc977b03 ]
Takashi Iwai f16f5f
Takashi Iwai f16f5f
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Takashi Iwai f16f5f
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Takashi Iwai f16f5f
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Takashi Iwai f16f5f
Signed-off-by: Sasha Levin <sashal@kernel.org>
Takashi Iwai f16f5f
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai f16f5f
Takashi Iwai f16f5f
---
Takashi Iwai f16f5f
 fs/ceph/caps.c | 2 ++
Takashi Iwai f16f5f
 1 file changed, 2 insertions(+)
Takashi Iwai f16f5f
Takashi Iwai f16f5f
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
Takashi Iwai f16f5f
index c619a926dc18..3296a93be907 100644
Takashi Iwai f16f5f
--- a/fs/ceph/caps.c
Takashi Iwai f16f5f
+++ b/fs/ceph/caps.c
Takashi Iwai f16f5f
@@ -1859,6 +1859,8 @@ static u64 __mark_caps_flushing(struct inode *inode,
Takashi Iwai f16f5f
  * try to invalidate mapping pages without blocking.
Takashi Iwai f16f5f
  */
Takashi Iwai f16f5f
 static int try_nonblocking_invalidate(struct inode *inode)
Takashi Iwai f16f5f
+	__releases(ci->i_ceph_lock)
Takashi Iwai f16f5f
+	__acquires(ci->i_ceph_lock)
Takashi Iwai f16f5f
 {
Takashi Iwai f16f5f
 	struct ceph_inode_info *ci = ceph_inode(inode);
Takashi Iwai f16f5f
 	u32 invalidating_gen = ci->i_rdcache_gen;
Takashi Iwai f16f5f
-- 
Takashi Iwai f16f5f
2.26.2
Takashi Iwai f16f5f