summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorLiu Bo <bo.li.liu@oracle.com>2012-08-21 21:13:25 -0600
committerChris Mason <chris.mason@oracle.com>2012-08-28 16:53:42 -0400
commitd280e5be940931c84bb2e9831ead9d02bc785484 (patch)
treec35062de4aff85ec5de5ad1e8d48d62c66fc8fcb /fs/btrfs
parent24c03fa5cf3d02c327cf9f2fc39f72664b1bd7e1 (diff)
downloadop-kernel-dev-d280e5be940931c84bb2e9831ead9d02bc785484.zip
op-kernel-dev-d280e5be940931c84bb2e9831ead9d02bc785484.tar.gz
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 <bo.li.liu@oracle.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/inode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 38cda78..6ba80b9 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 */
OpenPOWER on IntegriCloud