linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
To: Filipe David Borba Manana <fdmanana@gmail.com>,
	<linux-btrfs@vger.kernel.org>
Cc: <jbacik@fb.com>
Subject: Re: [PATCH] Btrfs: assert send doesn't attempt to start transactions
Date: Fri, 4 Jul 2014 08:18:40 +0900	[thread overview]
Message-ID: <53B5E4D0.10000@jp.fujitsu.com> (raw)
In-Reply-To: <1403628508-13711-1-git-send-email-fdmanana@gmail.com>

(2014/06/25 1:48), Filipe David Borba Manana wrote:
> When starting a transaction just assert that current->journal_info
> doesn't contain a send transaction stub, since send isn't supposed
> to start transactions and when it finishes (either successfully or
> not) it's supposed to set current->journal_info to NULL.
> 
> This is motivated by the change titled:
> 
>      Btrfs: fix crash when starting transaction
> 
> Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>

Reviewed-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>

Thanks,
Satoru

> ---
>   fs/btrfs/transaction.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> index 614eac3..47870ca 100644
> --- a/fs/btrfs/transaction.c
> +++ b/fs/btrfs/transaction.c
> @@ -386,11 +386,13 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type,
>   	bool reloc_reserved = false;
>   	int ret;
>   
> +	/* Send isn't supposed to start transactions. */
> +	ASSERT(current->journal_info != (void *)BTRFS_SEND_TRANS_STUB);
> +
>   	if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))
>   		return ERR_PTR(-EROFS);
>   
> -	if (current->journal_info &&
> -	    current->journal_info != (void *)BTRFS_SEND_TRANS_STUB) {
> +	if (current->journal_info) {
>   		WARN_ON(type & TRANS_EXTWRITERS);
>   		h = current->journal_info;
>   		h->use_count++;
> 


      reply	other threads:[~2014-07-03 23:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-24 16:48 [PATCH] Btrfs: assert send doesn't attempt to start transactions Filipe David Borba Manana
2014-07-03 23:18 ` Satoru Takeuchi [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=53B5E4D0.10000@jp.fujitsu.com \
    --to=takeuchi_satoru@jp.fujitsu.com \
    --cc=fdmanana@gmail.com \
    --cc=jbacik@fb.com \
    --cc=linux-btrfs@vger.kernel.org \
    /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).