From: Josef Bacik <jbacik@fusionio.com>
To: Miao Xie <miaox@cn.fujitsu.com>
Cc: Linux Btrfs <linux-btrfs@vger.kernel.org>
Subject: Re: [PATCH] Btrfs: fix double decrease of the writer counter
Date: Mon, 17 Sep 2012 12:31:41 -0400 [thread overview]
Message-ID: <20120917163141.GB3143@localhost.localdomain> (raw)
In-Reply-To: <5056C473.50709@cn.fujitsu.com>
On Mon, Sep 17, 2012 at 12:34:27AM -0600, Miao Xie wrote:
> In __btrfs_end_transaction(), we have invoked sb_end_intwrite(), but if we
> need run btrfs_commit_transaction(), we will decrease the writer counter
> for two times because btrfs_commit_transaction() also invokes sb_end_intwrite().
> Fix it.
>
Already fixed in btrfs-next. Thanks,
Josef
> Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
> ---
> fs/btrfs/transaction.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> index 27c2600..3134fdc 100644
> --- a/fs/btrfs/transaction.c
> +++ b/fs/btrfs/transaction.c
> @@ -551,8 +551,6 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
> btrfs_trans_release_metadata(trans, root);
> trans->block_rsv = NULL;
>
> - sb_end_intwrite(root->fs_info->sb);
> -
> if (lock && !atomic_read(&root->fs_info->open_ioctl_trans) &&
> should_end_transaction(trans, root)) {
> trans->transaction->blocked = 1;
> @@ -573,6 +571,8 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
> }
> }
>
> + sb_end_intwrite(root->fs_info->sb);
> +
> WARN_ON(cur_trans != info->running_transaction);
> WARN_ON(atomic_read(&cur_trans->num_writers) < 1);
> atomic_dec(&cur_trans->num_writers);
> --
> 1.7.6.5
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2012-09-17 16:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 6:34 [PATCH] Btrfs: fix double decrease of the writer counter Miao Xie
2012-09-17 16:31 ` Josef Bacik [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120917163141.GB3143@localhost.localdomain \
--to=jbacik@fusionio.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=miaox@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).