2010-10-04 08:26:57

by Namhyung Kim

Subject: [PATCH] jbd: Move debug message into #ifdef area

Move call to jbd_debug() into #ifdef CONFIG_JBD_DEBUG block because
'dropped' is declared there. The code could be compiled without this
change anyway, simply because jbd_debug() expands to nothing if
!CONFIG_JBD_DEBUG but IMHO it doesn't look good in general.

Signed-off-by: Namhyung Kim <[email protected]>
---
fs/jbd/recovery.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index 81051da..5b43e96 100644
--- a/fs/jbd/recovery.c
+++ b/fs/jbd/recovery.c
@@ -296,10 +296,10 @@ int journal_skip_recovery(journal_t *journal)
#ifdef CONFIG_JBD_DEBUG
int dropped = info.end_transaction -
be32_to_cpu(journal->j_superblock->s_sequence);
-#endif
jbd_debug(1,
"JBD: ignoring %d transaction%s from the journal.\n",
dropped, (dropped == 1) ? "" : "s");
+#endif
journal->j_transaction_sequence = ++info.end_transaction;
}

--
1.7.0.4

2010-10-04 09:40:42

by Jan Kara

Subject: Re: [PATCH] jbd: Move debug message into #ifdef area

On Mon 04-10-10 17:26:53, Namhyung Kim wrote:
> Move call to jbd_debug() into #ifdef CONFIG_JBD_DEBUG block because
> 'dropped' is declared there. The code could be compiled without this
> change anyway, simply because jbd_debug() expands to nothing if
> !CONFIG_JBD_DEBUG but IMHO it doesn't look good in general.
>
> Signed-off-by: Namhyung Kim <[email protected]>
Thanks. Merged into my tree.

Honza

> ---
> fs/jbd/recovery.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
> index 81051da..5b43e96 100644
> --- a/fs/jbd/recovery.c
> +++ b/fs/jbd/recovery.c
> @@ -296,10 +296,10 @@ int journal_skip_recovery(journal_t *journal)
> #ifdef CONFIG_JBD_DEBUG
> int dropped = info.end_transaction -
> be32_to_cpu(journal->j_superblock->s_sequence);
> -#endif
> jbd_debug(1,
> "JBD: ignoring %d transaction%s from the journal.\n",
> dropped, (dropped == 1) ? "" : "s");
> +#endif
> journal->j_transaction_sequence = ++info.end_transaction;
> }
>
> --
> 1.7.0.4
>

--
Jan Kara <[email protected]>
SUSE Labs, CR