summaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index d964195ea0e2..83bc8bfb3bea 100644
--- 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,
3231 overwrite = *((int *)iocb->private); 3231 overwrite = *((int *)iocb->private);
3232 3232
3233 if (overwrite) 3233 if (overwrite)
3234 mutex_unlock(&inode->i_mutex); 3234 inode_unlock(inode);
3235 3235
3236 /* 3236 /*
3237 * We could direct write to holes and fallocate. 3237 * We could direct write to holes and fallocate.
@@ -3331,7 +3331,7 @@ retake_lock:
3331 inode_dio_end(inode); 3331 inode_dio_end(inode);
3332 /* take i_mutex locking again if we do a ovewrite dio */ 3332 /* take i_mutex locking again if we do a ovewrite dio */
3333 if (overwrite) 3333 if (overwrite)
3334 mutex_lock(&inode->i_mutex); 3334 inode_lock(inode);
3335 3335
3336 return ret; 3336 return ret;
3337} 3337}
@@ -3653,7 +3653,7 @@ int ext4_update_disksize_before_punch(struct inode *inode, loff_t offset,
3653 handle_t *handle; 3653 handle_t *handle;
3654 loff_t size = i_size_read(inode); 3654 loff_t size = i_size_read(inode);
3655 3655
3656 WARN_ON(!mutex_is_locked(&inode->i_mutex)); 3656 WARN_ON(!inode_is_locked(inode));
3657 if (offset > size || offset + len < size) 3657 if (offset > size || offset + len < size)
3658 return 0; 3658 return 0;
3659 3659
@@ -3707,7 +3707,7 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)
3707 return ret; 3707 return ret;
3708 } 3708 }
3709 3709
3710 mutex_lock(&inode->i_mutex); 3710 inode_lock(inode);
3711 3711
3712 /* No need to punch hole beyond i_size */ 3712 /* No need to punch hole beyond i_size */
3713 if (offset >= inode->i_size) 3713 if (offset >= inode->i_size)
@@ -3809,7 +3809,7 @@ out_dio:
3809 up_write(&EXT4_I(inode)->i_mmap_sem); 3809 up_write(&EXT4_I(inode)->i_mmap_sem);
3810 ext4_inode_resume_unlocked_dio(inode); 3810 ext4_inode_resume_unlocked_dio(inode);
3811out_mutex: 3811out_mutex:
3812 mutex_unlock(&inode->i_mutex); 3812 inode_unlock(inode);
3813 return ret; 3813 return ret;
3814} 3814}
3815 3815
@@ -3879,7 +3879,7 @@ void ext4_truncate(struct inode *inode)
3879 * have i_mutex locked because it's not necessary. 3879 * have i_mutex locked because it's not necessary.
3880 */ 3880 */
3881 if (!(inode->i_state & (I_NEW|I_FREEING))) 3881 if (!(inode->i_state & (I_NEW|I_FREEING)))
3882 WARN_ON(!mutex_is_locked(&inode->i_mutex)); 3882 WARN_ON(!inode_is_locked(inode));
3883 trace_ext4_truncate_enter(inode); 3883 trace_ext4_truncate_enter(inode);
3884 3884
3885 if (!ext4_can_truncate(inode)) 3885 if (!ext4_can_truncate(inode))