Commit 917c16b2 authored by Chris Mason's avatar Chris Mason

Btrfs: fix oops on NULL trans handle in btrfs_truncate

If we fail to reserve space in the transaction during truncate, we can
error out with a NULL trans handle.  The cleanup code needs an extra
check to make sure we aren't trying to use the bad handle.
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 45ea6095
...@@ -6529,14 +6529,16 @@ static int btrfs_truncate(struct inode *inode) ...@@ -6529,14 +6529,16 @@ static int btrfs_truncate(struct inode *inode)
ret = btrfs_orphan_del(NULL, inode); ret = btrfs_orphan_del(NULL, inode);
} }
trans->block_rsv = &root->fs_info->trans_block_rsv; if (trans) {
ret = btrfs_update_inode(trans, root, inode); trans->block_rsv = &root->fs_info->trans_block_rsv;
if (ret && !err) ret = btrfs_update_inode(trans, root, inode);
err = ret; if (ret && !err)
err = ret;
nr = trans->blocks_used; nr = trans->blocks_used;
ret = btrfs_end_transaction_throttle(trans, root); ret = btrfs_end_transaction_throttle(trans, root);
btrfs_btree_balance_dirty(root, nr); btrfs_btree_balance_dirty(root, nr);
}
out: out:
btrfs_free_block_rsv(root, rsv); btrfs_free_block_rsv(root, rsv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment