1 files changed, 6 insertions, 6 deletions

diff --git a/fs/inode.c b/fs/inode.c
index 4b884f73214e..4ccbc21b30ce 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -166,8 +166,8 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
         spin_lock_init(&inode->i_lock);
         lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key);
 
-        mutex_init(&inode->i_mutex);
-        lockdep_set_class(&inode->i_mutex, &sb->s_type->i_mutex_key);
+        init_rwsem(&inode->i_rwsem);
+        lockdep_set_class(&inode->i_rwsem, &sb->s_type->i_mutex_key);
 
         atomic_set(&inode->i_dio_count, 0);
 
@@ -925,13 +925,13 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode)
                 struct file_system_type *type = inode->i_sb->s_type;
 
                 /* Set new key only if filesystem hasn't already changed it */
-                if (lockdep_match_class(&inode->i_mutex, &type->i_mutex_key)) {
+                if (lockdep_match_class(&inode->i_rwsem, &type->i_mutex_key)) {
                         /*
                          * ensure nobody is actually holding i_mutex
                          */
-                        mutex_destroy(&inode->i_mutex);
-                        mutex_init(&inode->i_mutex);
-                        lockdep_set_class(&inode->i_mutex,
+                        // mutex_destroy(&inode->i_mutex);
+                        init_rwsem(&inode->i_rwsem);
+                        lockdep_set_class(&inode->i_rwsem,
                                           &type->i_mutex_dir_key);
                 }
         }