openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Filipe David Borba Manana 2013-08-05 09:25:47 +01:00 committed by Chris Mason
parent 2bac325ea8
commit ada9af215c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/tree-log.c
View File

@ -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);
if (ret)
goto out;
btrfs_run_delayed_items(trans, root);
else
ret = btrfs_run_delayed_items(trans, root);
out:
kfree(name);
iput(inode);
@ -923,7 +924,9 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans,
kfree(victim_name);
if (ret)
return ret;
btrfs_run_delayed_items(trans, root);
ret = btrfs_run_delayed_items(trans, root);
if (ret)
return ret;
*search_done = 1;
goto again;
}
@ -990,7 +993,9 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans,
inode,
victim_name,
victim_name_len);
btrfs_run_delayed_items(trans, root);
if (!ret)
ret = btrfs_run_delayed_items(
trans, root);
}
iput(victim_parent);
kfree(victim_name);
@ -1812,7 +1817,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans,
ret = btrfs_unlink_inode(trans, root, dir, inode,
name, name_len);
if (!ret)
btrfs_run_delayed_items(trans, root);
ret = btrfs_run_delayed_items(trans, root);
kfree(name);
iput(inode);
if (ret)