--- x/fs/ext4/xattr.c
+++ y/fs/ext4/xattr.c
@@ -123,7 +123,8 @@ ext4_expand_inode_array(struct ext4_xatt
 #ifdef CONFIG_LOCKDEP
 void ext4_xattr_inode_set_class(struct inode *ea_inode)
 {
-	lockdep_set_subclass(&ea_inode->i_rwsem, 1);
+	lockdep_register_key(&ea_inode->i_lockkey);
+	lockdep_set_class(&ea_inode->i_rwsem, &ea_inode->i_lockkey);
 }
 #endif
 
--- x/include/linux/fs.h
+++ y/include/linux/fs.h
@@ -695,6 +695,7 @@ struct inode {
 	struct fscrypt_info	*i_crypt_info;
 #endif
 
+	struct lock_class_key 	i_lockkey;
 #ifdef CONFIG_FS_VERITY
 	struct fsverity_info	*i_verity_info;
 #endif