diff options
| author | Gu Zheng <guz.fnst@cn.fujitsu.com> | 2013-11-19 18:03:18 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-12-23 10:18:01 +0900 |
| commit | 58e674d6ab8b23ff1e933a8b714b302786351bd7 (patch) | |
| tree | 79d3415fad726fe5de744af7f6aa13dee8e568c1 | |
| parent | 1ff7bd3bb5f7f57bc7418ee6ed12f3ae217e4e9c (diff) | |
| download | op-kernel-dev-58e674d6ab8b23ff1e933a8b714b302786351bd7.zip op-kernel-dev-58e674d6ab8b23ff1e933a8b714b302786351bd7.tar.gz | |
f2fs: convert remove_inode_page to void
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
| -rw-r--r-- | fs/f2fs/f2fs.h | 2 | ||||
| -rw-r--r-- | fs/f2fs/node.c | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 05f8fe1..7078964 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1049,7 +1049,7 @@ int get_dnode_of_data(struct dnode_of_data *, pgoff_t, int); int truncate_inode_blocks(struct inode *, pgoff_t); int truncate_xattr_node(struct inode *, struct page *); int wait_on_node_pages_writeback(struct f2fs_sb_info *, nid_t); -int remove_inode_page(struct inode *); +void remove_inode_page(struct inode *); struct page *new_inode_page(struct inode *, const struct qstr *); struct page *new_node_page(struct dnode_of_data *, unsigned int, struct page *); void ra_node_page(struct f2fs_sb_info *, nid_t); diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 4ac4150..e7b6826 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -803,29 +803,25 @@ int truncate_xattr_node(struct inode *inode, struct page *page) * Caller should grab and release a mutex by calling mutex_lock_op() and * mutex_unlock_op(). */ -int remove_inode_page(struct inode *inode) +void remove_inode_page(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); struct page *page; nid_t ino = inode->i_ino; struct dnode_of_data dn; - int err; page = get_node_page(sbi, ino); if (IS_ERR(page)) - return PTR_ERR(page); + return; - err = truncate_xattr_node(inode, page); - if (err) { + if (truncate_xattr_node(inode, page)) { f2fs_put_page(page, 1); - return err; + return; } - /* 0 is possible, after f2fs_new_inode() is failed */ f2fs_bug_on(inode->i_blocks != 0 && inode->i_blocks != 1); set_new_dnode(&dn, inode, page, page, ino); truncate_node(&dn); - return 0; } struct page *new_inode_page(struct inode *inode, const struct qstr *name) |
