Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c68705b8 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: remove obsolete pointer for truncate_xattr_node 



This patch removes obosolete parameter for truncate_xattr_node.

Suggested-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent fee61cec

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2625,7 +2625,7 @@ void get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni); 
pgoff_t get_next_page_offset(struct dnode_of_data *dn, pgoff_t pgofs);

int get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode);

int truncate_inode_blocks(struct inode *inode, pgoff_t from);

int truncate_xattr_node(struct inode *inode, struct page *page);

int truncate_xattr_node(struct inode *inode);

int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino);

int remove_inode_page(struct inode *inode);

struct page *new_inode_page(struct inode *inode);

fs/f2fs/node.c

+4 −6
Original line number Diff line number Diff line
@@ -962,7 +962,8 @@ fail: 
	return err > 0 ? 0 : err;

}



int truncate_xattr_node(struct inode *inode, struct page *page)

/* caller must lock inode page */

int truncate_xattr_node(struct inode *inode)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	nid_t nid = F2FS_I(inode)->i_xattr_nid;
@@ -978,10 +979,7 @@ int truncate_xattr_node(struct inode *inode, struct page *page) 


	f2fs_i_xnid_write(inode, 0);



	set_new_dnode(&dn, inode, page, npage, nid);



	if (page)

		dn.inode_page_locked = true;

	set_new_dnode(&dn, inode, NULL, npage, nid);

	truncate_node(&dn);

	return 0;

}
@@ -1000,7 +998,7 @@ int remove_inode_page(struct inode *inode) 
	if (err)

		return err;



	err = truncate_xattr_node(inode, dn.inode_page);

	err = truncate_xattr_node(inode);

	if (err) {

		f2fs_put_dnode(&dn);

		return err;

fs/f2fs/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, 


		/* no need to use xattr node block */

		if (hsize <= inline_size) {

			err = truncate_xattr_node(inode, ipage);

			err = truncate_xattr_node(inode);

			alloc_nid_failed(sbi, new_nid);

			return err;

		}