* [PATCH] Btrfs: fix ordered extent leak when failing to start a transaction
@ 2012-08-22 3:13 bo.li.liu
2012-08-24 14:19 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: bo.li.liu @ 2012-08-22 3:13 UTC (permalink / raw)
To: linux-btrfs
From: Liu Bo <bo.li.liu@oracle.com>
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>
---
fs/btrfs/inode.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7131fac..f6c43ff 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1883,8 +1883,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 */
--
1.7.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Btrfs: fix ordered extent leak when failing to start a transaction
2012-08-22 3:13 [PATCH] Btrfs: fix ordered extent leak when failing to start a transaction bo.li.liu
@ 2012-08-24 14:19 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2012-08-24 14:19 UTC (permalink / raw)
To: bo.li.liu; +Cc: linux-btrfs
On Wed, Aug 22, 2012 at 11:13:25AM +0800, bo.li.liu@oracle.com wrote:
> 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>
> ---
> fs/btrfs/inode.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 7131fac..f6c43ff 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -1883,8 +1883,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;
> + }
The same code is used a few lines below (after locking the range) when
transaction fails, so I agree that this should be done here as well. Ack.
david
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-24 14:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-22 3:13 [PATCH] Btrfs: fix ordered extent leak when failing to start a transaction bo.li.liu
2012-08-24 14:19 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).