--- x/fs/ext4/xattr.c
+++ y/fs/ext4/xattr.c
@@ -119,11 +119,12 @@ ext4_expand_inode_array(struct ext4_xatt
 			struct inode *inode);
 
 #ifdef CONFIG_LOCKDEP
+static struct lock_class_key ea_i_rwsem_key;
 void ext4_xattr_inode_set_class(struct inode *ea_inode)
 {
 	struct ext4_inode_info *ei = EXT4_I(ea_inode);
 
-	lockdep_set_subclass(&ea_inode->i_rwsem, 1);
+	lockdep_set_class(&ea_inode->i_rwsem, &ea_i_rwsem_key);
 	(void) ei;	/* shut up clang warning if !CONFIG_LOCKDEP */
 	lockdep_set_subclass(&ei->i_data_sem, I_DATA_SEM_EA);
 }