mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-01 20:14:08 +00:00
Btrfs: don't ignore errors from btrfs_run_delayed_items
tree-log.c was ignoring the return value from btrfs_run_delayed_items() in several places. Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
parent
2bac325ea8
commit
ada9af215c
1 changed files with 9 additions and 4 deletions
|
@ -747,7 +747,8 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,
|
||||||
ret = btrfs_unlink_inode(trans, root, dir, inode, name, name_len);
|
ret = btrfs_unlink_inode(trans, root, dir, inode, name, name_len);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
btrfs_run_delayed_items(trans, root);
|
else
|
||||||
|
ret = btrfs_run_delayed_items(trans, root);
|
||||||
out:
|
out:
|
||||||
kfree(name);
|
kfree(name);
|
||||||
iput(inode);
|
iput(inode);
|
||||||
|
@ -923,7 +924,9 @@ again:
|
||||||
kfree(victim_name);
|
kfree(victim_name);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
btrfs_run_delayed_items(trans, root);
|
ret = btrfs_run_delayed_items(trans, root);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
*search_done = 1;
|
*search_done = 1;
|
||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
|
@ -990,7 +993,9 @@ again:
|
||||||
inode,
|
inode,
|
||||||
victim_name,
|
victim_name,
|
||||||
victim_name_len);
|
victim_name_len);
|
||||||
btrfs_run_delayed_items(trans, root);
|
if (!ret)
|
||||||
|
ret = btrfs_run_delayed_items(
|
||||||
|
trans, root);
|
||||||
}
|
}
|
||||||
iput(victim_parent);
|
iput(victim_parent);
|
||||||
kfree(victim_name);
|
kfree(victim_name);
|
||||||
|
@ -1812,7 +1817,7 @@ again:
|
||||||
ret = btrfs_unlink_inode(trans, root, dir, inode,
|
ret = btrfs_unlink_inode(trans, root, dir, inode,
|
||||||
name, name_len);
|
name, name_len);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
btrfs_run_delayed_items(trans, root);
|
ret = btrfs_run_delayed_items(trans, root);
|
||||||
kfree(name);
|
kfree(name);
|
||||||
iput(inode);
|
iput(inode);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
Loading…
Add table
Reference in a new issue