aboutsummaryrefslogtreecommitdiffstats
path: root/fs/logfs/readwrite.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/logfs/readwrite.c')
-rw-r--r--fs/logfs/readwrite.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index 20973c9e52f8..3fb8c6d67303 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -281,7 +281,7 @@ static struct page *logfs_get_read_page(struct inode *inode, u64 bix,
281static void logfs_put_read_page(struct page *page) 281static void logfs_put_read_page(struct page *page)
282{ 282{
283 unlock_page(page); 283 unlock_page(page);
284 page_cache_release(page); 284 put_page(page);
285} 285}
286 286
287static void logfs_lock_write_page(struct page *page) 287static void logfs_lock_write_page(struct page *page)
@@ -323,7 +323,7 @@ repeat:
323 return NULL; 323 return NULL;
324 err = add_to_page_cache_lru(page, mapping, index, GFP_NOFS); 324 err = add_to_page_cache_lru(page, mapping, index, GFP_NOFS);
325 if (unlikely(err)) { 325 if (unlikely(err)) {
326 page_cache_release(page); 326 put_page(page);
327 if (err == -EEXIST) 327 if (err == -EEXIST)
328 goto repeat; 328 goto repeat;
329 return NULL; 329 return NULL;
@@ -342,7 +342,7 @@ static void logfs_unlock_write_page(struct page *page)
342static void logfs_put_write_page(struct page *page) 342static void logfs_put_write_page(struct page *page)
343{ 343{
344 logfs_unlock_write_page(page); 344 logfs_unlock_write_page(page);
345 page_cache_release(page); 345 put_page(page);
346} 346}
347 347
348static struct page *logfs_get_page(struct inode *inode, u64 bix, level_t level, 348static struct page *logfs_get_page(struct inode *inode, u64 bix, level_t level,
@@ -562,7 +562,7 @@ static void indirect_free_block(struct super_block *sb,
562 562
563 if (PagePrivate(page)) { 563 if (PagePrivate(page)) {
564 ClearPagePrivate(page); 564 ClearPagePrivate(page);
565 page_cache_release(page); 565 put_page(page);
566 set_page_private(page, 0); 566 set_page_private(page, 0);
567 } 567 }
568 __free_block(sb, block); 568 __free_block(sb, block);
@@ -655,7 +655,7 @@ static void alloc_data_block(struct inode *inode, struct page *page)
655 block->page = page; 655 block->page = page;
656 656
657 SetPagePrivate(page); 657 SetPagePrivate(page);
658 page_cache_get(page); 658 get_page(page);
659 set_page_private(page, (unsigned long) block); 659 set_page_private(page, (unsigned long) block);
660 660
661 block->ops = &indirect_block_ops; 661 block->ops = &indirect_block_ops;
@@ -709,7 +709,7 @@ static u64 block_get_pointer(struct page *page, int index)
709 709
710static int logfs_read_empty(struct page *page) 710static int logfs_read_empty(struct page *page)
711{ 711{
712 zero_user_segment(page, 0, PAGE_CACHE_SIZE); 712 zero_user_segment(page, 0, PAGE_SIZE);
713 return 0; 713 return 0;
714} 714}
715 715
@@ -1660,7 +1660,7 @@ static int truncate_data_block(struct inode *inode, struct page *page,
1660 if (err) 1660 if (err)
1661 return err; 1661 return err;
1662 1662
1663 zero_user_segment(page, size - pageofs, PAGE_CACHE_SIZE); 1663 zero_user_segment(page, size - pageofs, PAGE_SIZE);
1664 return logfs_segment_write(inode, page, shadow); 1664 return logfs_segment_write(inode, page, shadow);
1665} 1665}
1666 1666
@@ -1919,7 +1919,7 @@ static void move_page_to_inode(struct inode *inode, struct page *page)
1919 block->page = NULL; 1919 block->page = NULL;
1920 if (PagePrivate(page)) { 1920 if (PagePrivate(page)) {
1921 ClearPagePrivate(page); 1921 ClearPagePrivate(page);
1922 page_cache_release(page); 1922 put_page(page);
1923 set_page_private(page, 0); 1923 set_page_private(page, 0);
1924 } 1924 }
1925} 1925}
@@ -1940,7 +1940,7 @@ static void move_inode_to_page(struct page *page, struct inode *inode)
1940 1940
1941 if (!PagePrivate(page)) { 1941 if (!PagePrivate(page)) {
1942 SetPagePrivate(page); 1942 SetPagePrivate(page);
1943 page_cache_get(page); 1943 get_page(page);
1944 set_page_private(page, (unsigned long) block); 1944 set_page_private(page, (unsigned long) block);
1945 } 1945 }
1946 1946
@@ -1971,7 +1971,7 @@ int logfs_read_inode(struct inode *inode)
1971 logfs_disk_to_inode(di, inode); 1971 logfs_disk_to_inode(di, inode);
1972 kunmap_atomic(di); 1972 kunmap_atomic(di);
1973 move_page_to_inode(inode, page); 1973 move_page_to_inode(inode, page);
1974 page_cache_release(page); 1974 put_page(page);
1975 return 0; 1975 return 0;
1976} 1976}
1977 1977