wrappers for ->i_mutex access

[linux-drm-fsl-dcu.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index d964195ea0e2ad15db38e5a5ae9e79a2a145d45b..83bc8bfb3bea8eeefed38ca46ae8260779222405 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3231,7 +3231,7 @@ static ssize_t ext4_ext_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
        overwrite = *((int *)iocb->private);
 
        if (overwrite)
-               mutex_unlock(&inode->i_mutex);
+               inode_unlock(inode);
 
        /*
         * We could direct write to holes and fallocate.
@@ -3331,7 +3331,7 @@ retake_lock:
                inode_dio_end(inode);
        /* take i_mutex locking again if we do a ovewrite dio */
        if (overwrite)
-               mutex_lock(&inode->i_mutex);
+               inode_lock(inode);
 
        return ret;
 }
@@ -3653,7 +3653,7 @@ int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset,
        handle_t *handle;
        loff_t size = i_size_read(inode);
 
-       WARN_ON(!mutex_is_locked(&inode->i_mutex));
+       WARN_ON(!inode_is_locked(inode));
        if (offset > size || offset + len < size)
                return 0;
 
@@ -3707,7 +3707,7 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)
                        return ret;
        }
 
-       mutex_lock(&inode->i_mutex);
+       inode_lock(inode);
 
        /* No need to punch hole beyond i_size */
        if (offset >= inode->i_size)
@@ -3809,7 +3809,7 @@ out_dio:
        up_write(&EXT4_I(inode)->i_mmap_sem);
        ext4_inode_resume_unlocked_dio(inode);
 out_mutex:
-       mutex_unlock(&inode->i_mutex);
+       inode_unlock(inode);
        return ret;
 }
 
@@ -3879,7 +3879,7 @@ void ext4_truncate(struct inode *inode)
         * have i_mutex locked because it's not necessary.
         */
        if (!(inode->i_state & (I_NEW|I_FREEING)))
-               WARN_ON(!mutex_is_locked(&inode->i_mutex));
+               WARN_ON(!inode_is_locked(inode));
        trace_ext4_truncate_enter(inode);
 
        if (!ext4_can_truncate(inode))