|
@@ -416,7 +416,7 @@ again:
|
|
|
}
|
|
|
if (start == 0) {
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
- BUG_ON(!trans);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
btrfs_set_trans_block_group(trans, inode);
|
|
|
trans->block_rsv = &root->fs_info->delalloc_block_rsv;
|
|
|
|
|
@@ -612,6 +612,7 @@ retry:
|
|
|
GFP_NOFS);
|
|
|
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
ret = btrfs_reserve_extent(trans, root,
|
|
|
async_extent->compressed_size,
|
|
|
async_extent->compressed_size,
|
|
@@ -771,7 +772,7 @@ static noinline int cow_file_range(struct inode *inode,
|
|
|
|
|
|
BUG_ON(root == root->fs_info->tree_root);
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
- BUG_ON(!trans);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
btrfs_set_trans_block_group(trans, inode);
|
|
|
trans->block_rsv = &root->fs_info->delalloc_block_rsv;
|
|
|
|
|
@@ -1049,7 +1050,7 @@ static noinline int run_delalloc_nocow(struct inode *inode,
|
|
|
} else {
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
}
|
|
|
- BUG_ON(!trans);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
|
|
|
cow_start = (u64)-1;
|
|
|
cur_offset = start;
|
|
@@ -1704,7 +1705,7 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end)
|
|
|
trans = btrfs_join_transaction_nolock(root, 1);
|
|
|
else
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
- BUG_ON(!trans);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
btrfs_set_trans_block_group(trans, inode);
|
|
|
trans->block_rsv = &root->fs_info->delalloc_block_rsv;
|
|
|
ret = btrfs_update_inode(trans, root, inode);
|
|
@@ -1721,6 +1722,7 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end)
|
|
|
trans = btrfs_join_transaction_nolock(root, 1);
|
|
|
else
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
btrfs_set_trans_block_group(trans, inode);
|
|
|
trans->block_rsv = &root->fs_info->delalloc_block_rsv;
|
|
|
|
|
@@ -2382,6 +2384,7 @@ void btrfs_orphan_cleanup(struct btrfs_root *root)
|
|
|
|
|
|
if (root->orphan_block_rsv || root->orphan_item_inserted) {
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
btrfs_end_transaction(trans, root);
|
|
|
}
|
|
|
|
|
@@ -4350,6 +4353,8 @@ int btrfs_write_inode(struct inode *inode, struct writeback_control *wbc)
|
|
|
trans = btrfs_join_transaction_nolock(root, 1);
|
|
|
else
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
+ if (IS_ERR(trans))
|
|
|
+ return PTR_ERR(trans);
|
|
|
btrfs_set_trans_block_group(trans, inode);
|
|
|
if (nolock)
|
|
|
ret = btrfs_end_transaction_nolock(trans, root);
|
|
@@ -4375,6 +4380,7 @@ void btrfs_dirty_inode(struct inode *inode)
|
|
|
return;
|
|
|
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
+ BUG_ON(IS_ERR(trans));
|
|
|
btrfs_set_trans_block_group(trans, inode);
|
|
|
|
|
|
ret = btrfs_update_inode(trans, root, inode);
|
|
@@ -5179,6 +5185,8 @@ again:
|
|
|
em = NULL;
|
|
|
btrfs_release_path(root, path);
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
+ if (IS_ERR(trans))
|
|
|
+ return ERR_CAST(trans);
|
|
|
goto again;
|
|
|
}
|
|
|
map = kmap(page);
|
|
@@ -5283,8 +5291,8 @@ static struct extent_map *btrfs_new_extent_direct(struct inode *inode,
|
|
|
btrfs_drop_extent_cache(inode, start, start + len - 1, 0);
|
|
|
|
|
|
trans = btrfs_join_transaction(root, 0);
|
|
|
- if (!trans)
|
|
|
- return ERR_PTR(-ENOMEM);
|
|
|
+ if (IS_ERR(trans))
|
|
|
+ return ERR_CAST(trans);
|
|
|
|
|
|
trans->block_rsv = &root->fs_info->delalloc_block_rsv;
|
|
|
|
|
@@ -5508,7 +5516,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
|
|
|
* while we look for nocow cross refs
|
|
|
*/
|
|
|
trans = btrfs_join_transaction(root, 0);
|
|
|
- if (!trans)
|
|
|
+ if (IS_ERR(trans))
|
|
|
goto must_cow;
|
|
|
|
|
|
if (can_nocow_odirect(trans, inode, start, len) == 1) {
|
|
@@ -5643,7 +5651,7 @@ again:
|
|
|
BUG_ON(!ordered);
|
|
|
|
|
|
trans = btrfs_join_transaction(root, 1);
|
|
|
- if (!trans) {
|
|
|
+ if (IS_ERR(trans)) {
|
|
|
err = -ENOMEM;
|
|
|
goto out;
|
|
|
}
|