Merge branch 'for-5.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis...

[linux-2.6-microblaze.git] / fs / ceph / mds_client.h

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 15c11a0..20e42d8 100644 (file)
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -186,10 +186,8 @@ struct ceph_mds_session {
 
        struct ceph_auth_handshake s_auth;
 
-       /* protected by s_gen_ttl_lock */
-       spinlock_t        s_gen_ttl_lock;
-       u32               s_cap_gen;  /* inc each time we get mds stale msg */
-       unsigned long     s_cap_ttl;  /* when session caps expire */
+       atomic_t          s_cap_gen;  /* inc each time we get mds stale msg */
+       unsigned long     s_cap_ttl;  /* when session caps expire. protected by s_mutex */
 
        /* protected by s_cap_lock */
        spinlock_t        s_cap_lock;