linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Btrfs: end transaction if we abort when creating qgroup root
@ 2015-09-23 18:56 Josef Bacik
  2015-09-23 19:00 ` [PATCH V2] " Josef Bacik
  0 siblings, 1 reply; 3+ messages in thread
From: Josef Bacik @ 2015-09-23 18:56 UTC (permalink / raw)
  To: kernel-team, linux-btrfs

We still need to call btrfs_end_transaction if we call btrfs_abort_transaction,
otherwise we hang and make me super grumpy.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
 fs/btrfs/volumes.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index fbe7c10..18b5e13 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4028,6 +4028,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
 	if (IS_ERR(uuid_root)) {
 		ret = PTR_ERR(uuid_root);
 		btrfs_abort_transaction(trans, tree_root, ret);
+		btrfs_end_transaction(trans, root);
 		return ret;
 	}
 
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH V2] Btrfs: end transaction if we abort when creating qgroup root
  2015-09-23 18:56 [PATCH] Btrfs: end transaction if we abort when creating qgroup root Josef Bacik
@ 2015-09-23 19:00 ` Josef Bacik
  2015-09-27  0:54   ` Omar Sandoval
  0 siblings, 1 reply; 3+ messages in thread
From: Josef Bacik @ 2015-09-23 19:00 UTC (permalink / raw)
  To: linux-btrfs, kernel-team

We still need to call btrfs_end_transaction if we call btrfs_abort_transaction,
otherwise we hang and make me super grumpy.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
V1->V2: should have compiled before I hit send.

 fs/btrfs/volumes.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index fbe7c10..ff64689 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4028,6 +4028,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
 	if (IS_ERR(uuid_root)) {
 		ret = PTR_ERR(uuid_root);
 		btrfs_abort_transaction(trans, tree_root, ret);
+		btrfs_end_transaction(trans, tree_root);
 		return ret;
 	}
 
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH V2] Btrfs: end transaction if we abort when creating qgroup root
  2015-09-23 19:00 ` [PATCH V2] " Josef Bacik
@ 2015-09-27  0:54   ` Omar Sandoval
  0 siblings, 0 replies; 3+ messages in thread
From: Omar Sandoval @ 2015-09-27  0:54 UTC (permalink / raw)
  To: Josef Bacik; +Cc: linux-btrfs, kernel-team

On Wed, Sep 23, 2015 at 03:00:37PM -0400, Josef Bacik wrote:
> We still need to call btrfs_end_transaction if we call btrfs_abort_transaction,
> otherwise we hang and make me super grumpy.  Thanks,

I made the same mistake in the free space tree, I'll fix that before I
forget.

> Signed-off-by: Josef Bacik <jbacik@fb.com>
> ---
> V1->V2: should have compiled before I hit send.
> 
>  fs/btrfs/volumes.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index fbe7c10..ff64689 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -4028,6 +4028,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)

The subject says the qgroup root but this is the uuid tree.

>  	if (IS_ERR(uuid_root)) {
>  		ret = PTR_ERR(uuid_root);
>  		btrfs_abort_transaction(trans, tree_root, ret);
> +		btrfs_end_transaction(trans, tree_root);
>  		return ret;
>  	}
>  
> -- 
> 1.8.3.1

-- 
Omar

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-09-27  0:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-23 18:56 [PATCH] Btrfs: end transaction if we abort when creating qgroup root Josef Bacik
2015-09-23 19:00 ` [PATCH V2] " Josef Bacik
2015-09-27  0:54   ` Omar Sandoval

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).