[2/7] jbd2: clarify bad journal block checksum message

Message ID 20180220023038.19883-3-tytso@mit.edu
State Accepted
Headers show
Series
  • ext4: fix up shutdown handling
Related show

Commit Message

Theodore Y. Ts'o Feb. 20, 2018, 2:30 a.m.
There were two error messages emitted by jbd2, one for a bad checksum
for a jbd2 descriptor block, and one for a bad checksum for a jbd2
data block.  Change the data block checksum error so that the two can
be disambiguated.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 fs/jbd2/recovery.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jan Kara March 6, 2018, 4:51 p.m. | #1
On Mon 19-02-18 21:30:33, Theodore Ts'o wrote:
> There were two error messages emitted by jbd2, one for a bad checksum
> for a jbd2 descriptor block, and one for a bad checksum for a jbd2
> data block.  Change the data block checksum error so that the two can
> be disambiguated.
> 
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Looks good. You can add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza


> ---
>  fs/jbd2/recovery.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
> index f99910b69c78..a4967b27ffb6 100644
> --- a/fs/jbd2/recovery.c
> +++ b/fs/jbd2/recovery.c
> @@ -600,8 +600,8 @@ static int do_one_pass(journal_t *journal,
>  						success = -EFSBADCRC;
>  						printk(KERN_ERR "JBD2: Invalid "
>  						       "checksum recovering "
> -						       "block %llu in log\n",
> -						       blocknr);
> +						       "data block %llu in "
> +						       "log\n", blocknr);
>  						block_error = 1;
>  						goto skip_write;
>  					}
> -- 
> 2.16.1.72.g5be1f00a9a
>

Patch

diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index f99910b69c78..a4967b27ffb6 100644
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -600,8 +600,8 @@  static int do_one_pass(journal_t *journal,
 						success = -EFSBADCRC;
 						printk(KERN_ERR "JBD2: Invalid "
 						       "checksum recovering "
-						       "block %llu in log\n",
-						       blocknr);
+						       "data block %llu in "
+						       "log\n", blocknr);
 						block_error = 1;
 						goto skip_write;
 					}