f2fs: remove deprecated parameter

Remove deprecated paramter.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 6fbb1ed182f6dbd0e83e9ff035d1983bf7cd3e46..f6ab3c2f814508ad030868091b85991a453e63f2 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -664,7 +664,7 @@ fail:
        return err;
 }
 
-void f2fs_drop_nlink(struct inode *dir, struct inode *inode, struct page *page)
+void f2fs_drop_nlink(struct inode *dir, struct inode *inode)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
 
@@ -723,7 +723,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
        mark_inode_dirty_sync(dir);
 
        if (inode)
-               f2fs_drop_nlink(dir, inode, NULL);
+               f2fs_drop_nlink(dir, inode);
 
        if (bit_pos == NR_DENTRY_IN_BLOCK &&
                        !truncate_hole(dir, page->index, page->index + 1)) {

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 4fec9e7038b65f3bf89ea9ae8441f7faf2243766..dc9e2798ba9c933577108e8d7f6da47ad350da18 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1895,7 +1895,7 @@ struct page *init_inode_metadata(struct inode *, struct inode *,
                        const struct qstr *, struct page *);
 void update_parent_metadata(struct inode *, struct inode *, unsigned int);
 int room_for_filename(const void *, int, int);
-void f2fs_drop_nlink(struct inode *, struct inode *, struct page *);
+void f2fs_drop_nlink(struct inode *, struct inode *);
 struct f2fs_dir_entry *f2fs_find_entry(struct inode *, struct qstr *,
                                                        struct page **);
 struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **);

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 1eb30431bf445d64fae579d405801fc37e8fde66..669f92ffd111cb1461f4137ff1aa3d848968b89f 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -582,14 +582,13 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page,
                                &inline_dentry->dentry_bitmap);
 
        set_page_dirty(page);
+       f2fs_put_page(page, 1);
 
        dir->i_ctime = dir->i_mtime = CURRENT_TIME;
        mark_inode_dirty_sync(dir);
 
        if (inode)
-               f2fs_drop_nlink(dir, inode, page);
-
-       f2fs_put_page(page, 1);
+               f2fs_drop_nlink(dir, inode);
 }
 
 bool f2fs_empty_inline_dir(struct inode *dir)