diff options
Diffstat (limited to 'fs/logfs/segment.c')
| -rw-r--r-- | fs/logfs/segment.c | 28 | 
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c index d270e4b2ab6b..1efd6055f4b0 100644 --- a/fs/logfs/segment.c +++ b/fs/logfs/segment.c @@ -90,9 +90,9 @@ int __logfs_buf_write(struct logfs_area *area, u64 ofs, void *buf, size_t len,  		if (!PagePrivate(page)) {  			SetPagePrivate(page); -			page_cache_get(page); +			get_page(page);  		} -		page_cache_release(page); +		put_page(page);  		buf += copylen;  		len -= copylen; @@ -117,9 +117,9 @@ static void pad_partial_page(struct logfs_area *area)  		memset(page_address(page) + offset, 0xff, len);  		if (!PagePrivate(page)) {  			SetPagePrivate(page); -			page_cache_get(page); +			get_page(page);  		} -		page_cache_release(page); +		put_page(page);  	}  } @@ -129,20 +129,20 @@ static void pad_full_pages(struct logfs_area *area)  	struct logfs_super *super = logfs_super(sb);  	u64 ofs = dev_ofs(sb, area->a_segno, area->a_used_bytes);  	u32 len = super->s_segsize - area->a_used_bytes; -	pgoff_t index = PAGE_CACHE_ALIGN(ofs) >> PAGE_CACHE_SHIFT; -	pgoff_t no_indizes = len >> PAGE_CACHE_SHIFT; +	pgoff_t index = PAGE_ALIGN(ofs) >> PAGE_SHIFT; +	pgoff_t no_indizes = len >> PAGE_SHIFT;  	struct page *page;  	while (no_indizes) {  		page = get_mapping_page(sb, index, 0);  		BUG_ON(!page); /* FIXME: reserve a pool */  		SetPageUptodate(page); -		memset(page_address(page), 0xff, PAGE_CACHE_SIZE); +		memset(page_address(page), 0xff, PAGE_SIZE);  		if (!PagePrivate(page)) {  			SetPagePrivate(page); -			page_cache_get(page); +			get_page(page);  		} -		page_cache_release(page); +		put_page(page);  		index++;  		no_indizes--;  	} @@ -411,7 +411,7 @@ int wbuf_read(struct super_block *sb, u64 ofs, size_t len, void *buf)  		if (IS_ERR(page))  			return PTR_ERR(page);  		memcpy(buf, page_address(page) + offset, copylen); -		page_cache_release(page); +		put_page(page);  		buf += copylen;  		len -= copylen; @@ -499,7 +499,7 @@ static void move_btree_to_page(struct inode *inode, struct page *page,  	if (!PagePrivate(page)) {  		SetPagePrivate(page); -		page_cache_get(page); +		get_page(page);  		set_page_private(page, (unsigned long) block);  	}  	block->ops = &indirect_block_ops; @@ -554,7 +554,7 @@ void move_page_to_btree(struct page *page)  	if (PagePrivate(page)) {  		ClearPagePrivate(page); -		page_cache_release(page); +		put_page(page);  		set_page_private(page, 0);  	}  	block->ops = &btree_block_ops; @@ -723,9 +723,9 @@ void freeseg(struct super_block *sb, u32 segno)  			continue;  		if (PagePrivate(page)) {  			ClearPagePrivate(page); -			page_cache_release(page); +			put_page(page);  		} -		page_cache_release(page); +		put_page(page);  	}  }  | 
