From: Liu Bo Date: Wed, 22 Aug 2012 03:13:25 +0000 (-0600) Subject: Btrfs: fix ordered extent leak when failing to start a transaction X-Git-Tag: MMI-PSA29.97-13-9~16003^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d280e5be940931c84bb2e9831ead9d02bc785484;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Btrfs: fix ordered extent leak when failing to start a transaction We cannot just return error before freeing ordered extent and releasing reserved space when we fail to start a transacion. Signed-off-by: Liu Bo Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 38cda78de5e4..6ba80b902877 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1882,8 +1882,11 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) trans = btrfs_join_transaction_nolock(root); else trans = btrfs_join_transaction(root); - if (IS_ERR(trans)) - return PTR_ERR(trans); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + trans = NULL; + goto out; + } trans->block_rsv = &root->fs_info->delalloc_block_rsv; ret = btrfs_update_inode_fallback(trans, root, inode); if (ret) /* -ENOMEM or corruption */