aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/inline.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r--fs/ext4/inline.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 7cbdd3752ba5..7bc6c855cc18 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -482,7 +482,7 @@ static int ext4_read_inline_page(struct inode *inode, struct page *page)
482 ret = ext4_read_inline_data(inode, kaddr, len, &iloc); 482 ret = ext4_read_inline_data(inode, kaddr, len, &iloc);
483 flush_dcache_page(page); 483 flush_dcache_page(page);
484 kunmap_atomic(kaddr); 484 kunmap_atomic(kaddr);
485 zero_user_segment(page, len, PAGE_CACHE_SIZE); 485 zero_user_segment(page, len, PAGE_SIZE);
486 SetPageUptodate(page); 486 SetPageUptodate(page);
487 brelse(iloc.bh); 487 brelse(iloc.bh);
488 488
@@ -507,7 +507,7 @@ int ext4_readpage_inline(struct inode *inode, struct page *page)
507 if (!page->index) 507 if (!page->index)
508 ret = ext4_read_inline_page(inode, page); 508 ret = ext4_read_inline_page(inode, page);
509 else if (!PageUptodate(page)) { 509 else if (!PageUptodate(page)) {
510 zero_user_segment(page, 0, PAGE_CACHE_SIZE); 510 zero_user_segment(page, 0, PAGE_SIZE);
511 SetPageUptodate(page); 511 SetPageUptodate(page);
512 } 512 }
513 513
@@ -595,7 +595,7 @@ retry:
595 595
596 if (ret) { 596 if (ret) {
597 unlock_page(page); 597 unlock_page(page);
598 page_cache_release(page); 598 put_page(page);
599 page = NULL; 599 page = NULL;
600 ext4_orphan_add(handle, inode); 600 ext4_orphan_add(handle, inode);
601 up_write(&EXT4_I(inode)->xattr_sem); 601 up_write(&EXT4_I(inode)->xattr_sem);
@@ -621,7 +621,7 @@ retry:
621out: 621out:
622 if (page) { 622 if (page) {
623 unlock_page(page); 623 unlock_page(page);
624 page_cache_release(page); 624 put_page(page);
625 } 625 }
626 if (sem_held) 626 if (sem_held)
627 up_write(&EXT4_I(inode)->xattr_sem); 627 up_write(&EXT4_I(inode)->xattr_sem);
@@ -690,7 +690,7 @@ int ext4_try_to_write_inline_data(struct address_space *mapping,
690 if (!ext4_has_inline_data(inode)) { 690 if (!ext4_has_inline_data(inode)) {
691 ret = 0; 691 ret = 0;
692 unlock_page(page); 692 unlock_page(page);
693 page_cache_release(page); 693 put_page(page);
694 goto out_up_read; 694 goto out_up_read;
695 } 695 }
696 696
@@ -815,7 +815,7 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,
815 if (ret) { 815 if (ret) {
816 up_read(&EXT4_I(inode)->xattr_sem); 816 up_read(&EXT4_I(inode)->xattr_sem);
817 unlock_page(page); 817 unlock_page(page);
818 page_cache_release(page); 818 put_page(page);
819 ext4_truncate_failed_write(inode); 819 ext4_truncate_failed_write(inode);
820 return ret; 820 return ret;
821 } 821 }
@@ -829,7 +829,7 @@ out:
829 up_read(&EXT4_I(inode)->xattr_sem); 829 up_read(&EXT4_I(inode)->xattr_sem);
830 if (page) { 830 if (page) {
831 unlock_page(page); 831 unlock_page(page);
832 page_cache_release(page); 832 put_page(page);
833 } 833 }
834 return ret; 834 return ret;
835} 835}
@@ -919,7 +919,7 @@ retry_journal:
919out_release_page: 919out_release_page:
920 up_read(&EXT4_I(inode)->xattr_sem); 920 up_read(&EXT4_I(inode)->xattr_sem);
921 unlock_page(page); 921 unlock_page(page);
922 page_cache_release(page); 922 put_page(page);
923out_journal: 923out_journal:
924 ext4_journal_stop(handle); 924 ext4_journal_stop(handle);
925out: 925out:
@@ -947,7 +947,7 @@ int ext4_da_write_inline_data_end(struct inode *inode, loff_t pos,
947 i_size_changed = 1; 947 i_size_changed = 1;
948 } 948 }
949 unlock_page(page); 949 unlock_page(page);
950 page_cache_release(page); 950 put_page(page);
951 951
952 /* 952 /*
953 * Don't mark the inode dirty under page lock. First, it unnecessarily 953 * Don't mark the inode dirty under page lock. First, it unnecessarily