aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGu Zheng <guz.fnst@cn.fujitsu.com>2013-11-19 05:03:18 -0500
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-12-22 20:18:01 -0500
commit58e674d6ab8b23ff1e933a8b714b302786351bd7 (patch)
tree79d3415fad726fe5de744af7f6aa13dee8e568c1 /fs
parent1ff7bd3bb5f7f57bc7418ee6ed12f3ae217e4e9c (diff)
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/f2fs.h2
-rw-r--r--fs/f2fs/node.c12
2 files changed, 5 insertions, 9 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 05f8fe1399ac..707896456a42 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);
1049int truncate_inode_blocks(struct inode *, pgoff_t); 1049int truncate_inode_blocks(struct inode *, pgoff_t);
1050int truncate_xattr_node(struct inode *, struct page *); 1050int truncate_xattr_node(struct inode *, struct page *);
1051int wait_on_node_pages_writeback(struct f2fs_sb_info *, nid_t); 1051int wait_on_node_pages_writeback(struct f2fs_sb_info *, nid_t);
1052int remove_inode_page(struct inode *); 1052void remove_inode_page(struct inode *);
1053struct page *new_inode_page(struct inode *, const struct qstr *); 1053struct page *new_inode_page(struct inode *, const struct qstr *);
1054struct page *new_node_page(struct dnode_of_data *, unsigned int, struct page *); 1054struct page *new_node_page(struct dnode_of_data *, unsigned int, struct page *);
1055void ra_node_page(struct f2fs_sb_info *, nid_t); 1055void ra_node_page(struct f2fs_sb_info *, nid_t);
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 4ac4150d421d..e7b6826beac4 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)
803 * Caller should grab and release a mutex by calling mutex_lock_op() and 803 * Caller should grab and release a mutex by calling mutex_lock_op() and
804 * mutex_unlock_op(). 804 * mutex_unlock_op().
805 */ 805 */
806int remove_inode_page(struct inode *inode) 806void remove_inode_page(struct inode *inode)
807{ 807{
808 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); 808 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
809 struct page *page; 809 struct page *page;
810 nid_t ino = inode->i_ino; 810 nid_t ino = inode->i_ino;
811 struct dnode_of_data dn; 811 struct dnode_of_data dn;
812 int err;
813 812
814 page = get_node_page(sbi, ino); 813 page = get_node_page(sbi, ino);
815 if (IS_ERR(page)) 814 if (IS_ERR(page))
816 return PTR_ERR(page); 815 return;
817 816
818 err = truncate_xattr_node(inode, page); 817 if (truncate_xattr_node(inode, page)) {
819 if (err) {
820 f2fs_put_page(page, 1); 818 f2fs_put_page(page, 1);
821 return err; 819 return;
822 } 820 }
823
824 /* 0 is possible, after f2fs_new_inode() is failed */ 821 /* 0 is possible, after f2fs_new_inode() is failed */
825 f2fs_bug_on(inode->i_blocks != 0 && inode->i_blocks != 1); 822 f2fs_bug_on(inode->i_blocks != 0 && inode->i_blocks != 1);
826 set_new_dnode(&dn, inode, page, page, ino); 823 set_new_dnode(&dn, inode, page, page, ino);
827 truncate_node(&dn); 824 truncate_node(&dn);
828 return 0;
829} 825}
830 826
831struct page *new_inode_page(struct inode *inode, const struct qstr *name) 827struct page *new_inode_page(struct inode *inode, const struct qstr *name)