From: Jan Kara <jack@suse.cz>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jan Kara <jack@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>,
linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/4] jbd: relocate assert after state lock in journal_commit_transaction()
Date: Thu, 1 Aug 2013 23:24:54 +0200 [thread overview]
Message-ID: <20130801212454.GE31857@quack.suse.cz> (raw)
In-Reply-To: <1375383668-8072-3-git-send-email-paul.gortmaker@windriver.com>
On Thu 01-08-13 15:01:06, Paul Gortmaker wrote:
> Backport of jbd2 commit 3ca841c106fd6cd2c942985977a5d126434a8dd6
> ("jbd2: relocate assert after state lock in journal_commit_transaction()")
>
> Quoting that commit:
> ---------------
> The state lock is taken after we are doing an assert on the state
> value, not before. So we might in fact be doing an assert on a
> transient value. Ensure the state check is within the scope of
> the state lock being taken.
> ---------------
Thanks. I've added this patch to my tree.
Honza
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> fs/jbd/commit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
> index 11bb11f..bb217dc 100644
> --- a/fs/jbd/commit.c
> +++ b/fs/jbd/commit.c
> @@ -340,13 +340,13 @@ void journal_commit_transaction(journal_t *journal)
> J_ASSERT(journal->j_committing_transaction == NULL);
>
> commit_transaction = journal->j_running_transaction;
> - J_ASSERT(commit_transaction->t_state == T_RUNNING);
>
> trace_jbd_start_commit(journal, commit_transaction);
> jbd_debug(1, "JBD: starting commit of transaction %d\n",
> commit_transaction->t_tid);
>
> spin_lock(&journal->j_state_lock);
> + J_ASSERT(commit_transaction->t_state == T_RUNNING);
> commit_transaction->t_state = T_LOCKED;
>
> trace_jbd_commit_locking(journal, commit_transaction);
> --
> 1.8.1.2
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
next prev parent reply other threads:[~2013-08-01 21:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-01 19:01 [PATCH 0/4] Backports of jbd2 commits to jbd Paul Gortmaker
2013-08-01 19:01 ` [PATCH 1/4] jbd: use module parameters instead of debugfs for jbd_debug Paul Gortmaker
2013-08-01 21:24 ` Jan Kara
2013-08-01 23:18 ` Paul Gortmaker
2013-08-01 19:01 ` [PATCH 2/4] jbd: relocate assert after state lock in journal_commit_transaction() Paul Gortmaker
2013-08-01 21:24 ` Jan Kara [this message]
2013-08-01 19:01 ` [PATCH 3/4] jbd: drop checkpoint mutex when waiting in __log_wait_for_space() Paul Gortmaker
2013-08-01 22:35 ` Jan Kara
2013-08-01 19:01 ` [PATCH 4/4] jbd: use a single printk for jbd_debug() Paul Gortmaker
2013-08-01 19:21 ` Joe Perches
2013-08-01 22:23 ` Jan Kara
2013-08-01 22:19 ` Jan Kara
2013-08-01 19:08 ` [PATCH 0/4] Backports of jbd2 commits to jbd Paul Gortmaker
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=20130801212454.GE31857@quack.suse.cz \
--to=jack@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paul.gortmaker@windriver.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).