Btrfs: return error code to caller when btrfs_del_item fails
The error code is returned instead of calling BUG_ON when
btrfs_del_item returns the error.
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index f997ec0..cf2baeb 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1050,7 +1050,8 @@
break;
ret = btrfs_del_item(trans, root, path);
- BUG_ON(ret);
+ if (ret)
+ goto out;
btrfs_release_path(root, path);
inode = read_one_inode(root, key.offset);
@@ -1068,8 +1069,10 @@
*/
key.offset = (u64)-1;
}
+ ret = 0;
+out:
btrfs_release_path(root, path);
- return 0;
+ return ret;
}
@@ -2587,7 +2590,8 @@
break;
ret = btrfs_del_item(trans, log, path);
- BUG_ON(ret);
+ if (ret)
+ break;
btrfs_release_path(log, path);
}
btrfs_release_path(log, path);