diff options
Diffstat (limited to 'fs/ext4/file.c')
-rw-r--r-- | fs/ext4/file.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 749b222e6498..8eb87e3e2752 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c | |||
@@ -113,7 +113,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) | |||
113 | ext4_unwritten_wait(inode); | 113 | ext4_unwritten_wait(inode); |
114 | } | 114 | } |
115 | 115 | ||
116 | mutex_lock(&inode->i_mutex); | 116 | inode_lock(inode); |
117 | ret = generic_write_checks(iocb, from); | 117 | ret = generic_write_checks(iocb, from); |
118 | if (ret <= 0) | 118 | if (ret <= 0) |
119 | goto out; | 119 | goto out; |
@@ -169,7 +169,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | ret = __generic_file_write_iter(iocb, from); | 171 | ret = __generic_file_write_iter(iocb, from); |
172 | mutex_unlock(&inode->i_mutex); | 172 | inode_unlock(inode); |
173 | 173 | ||
174 | if (ret > 0) { | 174 | if (ret > 0) { |
175 | ssize_t err; | 175 | ssize_t err; |
@@ -186,7 +186,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) | |||
186 | return ret; | 186 | return ret; |
187 | 187 | ||
188 | out: | 188 | out: |
189 | mutex_unlock(&inode->i_mutex); | 189 | inode_unlock(inode); |
190 | if (aio_mutex) | 190 | if (aio_mutex) |
191 | mutex_unlock(aio_mutex); | 191 | mutex_unlock(aio_mutex); |
192 | return ret; | 192 | return ret; |
@@ -561,11 +561,11 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) | |||
561 | int blkbits; | 561 | int blkbits; |
562 | int ret = 0; | 562 | int ret = 0; |
563 | 563 | ||
564 | mutex_lock(&inode->i_mutex); | 564 | inode_lock(inode); |
565 | 565 | ||
566 | isize = i_size_read(inode); | 566 | isize = i_size_read(inode); |
567 | if (offset >= isize) { | 567 | if (offset >= isize) { |
568 | mutex_unlock(&inode->i_mutex); | 568 | inode_unlock(inode); |
569 | return -ENXIO; | 569 | return -ENXIO; |
570 | } | 570 | } |
571 | 571 | ||
@@ -613,7 +613,7 @@ static loff_t ext4_seek_data(struct file *file, loff_t offset, loff_t maxsize) | |||
613 | dataoff = (loff_t)last << blkbits; | 613 | dataoff = (loff_t)last << blkbits; |
614 | } while (last <= end); | 614 | } while (last <= end); |
615 | 615 | ||
616 | mutex_unlock(&inode->i_mutex); | 616 | inode_unlock(inode); |
617 | 617 | ||
618 | if (dataoff > isize) | 618 | if (dataoff > isize) |
619 | return -ENXIO; | 619 | return -ENXIO; |
@@ -634,11 +634,11 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize) | |||
634 | int blkbits; | 634 | int blkbits; |
635 | int ret = 0; | 635 | int ret = 0; |
636 | 636 | ||
637 | mutex_lock(&inode->i_mutex); | 637 | inode_lock(inode); |
638 | 638 | ||
639 | isize = i_size_read(inode); | 639 | isize = i_size_read(inode); |
640 | if (offset >= isize) { | 640 | if (offset >= isize) { |
641 | mutex_unlock(&inode->i_mutex); | 641 | inode_unlock(inode); |
642 | return -ENXIO; | 642 | return -ENXIO; |
643 | } | 643 | } |
644 | 644 | ||
@@ -689,7 +689,7 @@ static loff_t ext4_seek_hole(struct file *file, loff_t offset, loff_t maxsize) | |||
689 | break; | 689 | break; |
690 | } while (last <= end); | 690 | } while (last <= end); |
691 | 691 | ||
692 | mutex_unlock(&inode->i_mutex); | 692 | inode_unlock(inode); |
693 | 693 | ||
694 | if (holeoff > isize) | 694 | if (holeoff > isize) |
695 | holeoff = isize; | 695 | holeoff = isize; |