btrfs: Remove delay_iput parameter from __start_delalloc_inodes

It's always set to 0 so remove it.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
[ rename to start_delalloc_inodes ]
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c6ff72a1ff10e9044b50a4388e6b04db9831d371..20a385b0668fb6c609f36f248ebe7e6feeffefe2 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -10190,8 +10190,7 @@ struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode,
  * some fairly slow code that needs optimization. This walks the list
  * of all the inodes with pending delalloc and forces them to disk.
  */
  * some fairly slow code that needs optimization. This walks the list
  * of all the inodes with pending delalloc and forces them to disk.
  */

-static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput,
-                                  int nr)
+static int start_delalloc_inodes(struct btrfs_root *root, int nr)

 {
        struct btrfs_inode *binode;
        struct inode *inode;
 {
        struct btrfs_inode *binode;
        struct inode *inode;


@@ -10219,12 +10218,9 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput,
                }
                spin_unlock(&root->delalloc_lock);
 
                }
                spin_unlock(&root->delalloc_lock);
 

-               work = btrfs_alloc_delalloc_work(inode, delay_iput);
+               work = btrfs_alloc_delalloc_work(inode, 0);

                if (!work) {
                if (!work) {

-                       if (delay_iput)
-                               btrfs_add_delayed_iput(inode);
-                       else
-                               iput(inode);
+                       iput(inode);

                        ret = -ENOMEM;
                        goto out;
                }
                        ret = -ENOMEM;
                        goto out;
                }


@@ -10263,7 +10259,7 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root)
        if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
                return -EROFS;
 
        if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))
                return -EROFS;
 

-       ret = __start_delalloc_inodes(root, 0, -1);
+       ret = start_delalloc_inodes(root, -1);

        if (ret > 0)
                ret = 0;
        return ret;
        if (ret > 0)
                ret = 0;
        return ret;


@@ -10292,7 +10288,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int nr)
                               &fs_info->delalloc_roots);
                spin_unlock(&fs_info->delalloc_root_lock);
 
                               &fs_info->delalloc_roots);
                spin_unlock(&fs_info->delalloc_root_lock);
 

-               ret = __start_delalloc_inodes(root, 0, nr);
+               ret = start_delalloc_inodes(root, nr);

                btrfs_put_fs_root(root);
                if (ret < 0)
                        goto out;
                btrfs_put_fs_root(root);
                if (ret < 0)
                        goto out;