513,515d512
< /*
<  * This function always returns success
<  */
719,720c716
<  * f2fs_unlock_op() only if ro is not set RDONLY_NODE.
<  * In the case of RDONLY_NODE, we don't need to care about mutex.
---
>  * f2fs_unlock_op() only if mode is set with ALLOC_NODE.
812,813c808
< 	dn->data_blkaddr = datablock_addr(dn->inode,
< 				dn->node_page, dn->ofs_in_node);
---
> 	dn->data_blkaddr = f2fs_data_blkaddr(dn);
1191,1192c1186,1188
< 		f2fs_warn(F2FS_I_SB(inode), "Inconsistent i_blocks, ino:%lu, iblocks:%llu",
< 			  inode->i_ino, (unsigned long long)inode->i_blocks);
---
> 		f2fs_warn(F2FS_I_SB(inode),
> 			"f2fs_remove_inode_page: inconsistent i_blocks, ino:%lu, iblocks:%llu",
> 			inode->i_ino, (unsigned long long)inode->i_blocks);
1565,1567c1561
< 	set_page_writeback(page);
< 	ClearPageError(page);
< 
---
> 	/* should add to global list before clearing PAGECACHE status */
1573a1568,1570
> 	set_page_writeback(page);
> 	ClearPageError(page);
> 
1982c1979
< 	f2fs_balance_fs_bg(sbi);
---
> 	f2fs_balance_fs_bg(sbi, true);
2605c2602
< 		congestion_wait(BLK_RW_ASYNC, HZ/50);
---
> 		congestion_wait(BLK_RW_ASYNC, DEFAULT_IO_TIMEOUT);
3196c3193
< 	nat_entry_slab = f2fs_kmem_cache_create("nat_entry",
---
> 	nat_entry_slab = f2fs_kmem_cache_create("f2fs_nat_entry",
3201c3198
< 	free_nid_slab = f2fs_kmem_cache_create("free_nid",
---
> 	free_nid_slab = f2fs_kmem_cache_create("f2fs_free_nid",
3206c3203
< 	nat_entry_set_slab = f2fs_kmem_cache_create("nat_entry_set",
---
> 	nat_entry_set_slab = f2fs_kmem_cache_create("f2fs_nat_entry_set",
3211c3208
< 	fsync_node_entry_slab = f2fs_kmem_cache_create("fsync_node_entry",
---
> 	fsync_node_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_node_entry",