f2fs: remove obsolete pointer for truncate_xattr_node

This patch removes obosolete parameter for truncate_xattr_node.

Suggested-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 0b0e4fba69c43f510f9857cfe073b1098dd7799a..a49d281bacab3e5c1dc7eefb97d36a4dca407ee7 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2511,7 +2511,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);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index d571961f42a733613696abe5216bd1061a416607..bdb7e92636b41405310437459dad3cf5c77274de 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -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;

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 7695654726ebd8663491927c00e2872e78a13119..5a85627d4955d464a5c32b69b53bd9aec909c349 100644 (file)
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -421,7 +421,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;
                }