Patchwork ext3: Fix debug messages in ext3_group_extend()

login
register
mail settings
Submitter Namhyung Kim
Date Oct. 16, 2010, 4:11 p.m.
Message ID <1287245483-3557-1-git-send-email-namhyung@gmail.com>
Download mbox | patch
Permalink /patch/68048/
State Not Applicable
Headers show

Comments

Namhyung Kim - Oct. 16, 2010, 4:11 p.m.
Fix a typo, break long lines and use E3FSBLK on ext3_fsblk_t.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 fs/ext3/resize.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
Jan Kara - Oct. 18, 2010, 10:57 a.m.
On Sun 17-10-10 01:11:23, Namhyung Kim wrote:
> Fix a typo, break long lines and use E3FSBLK on ext3_fsblk_t.
  Thanks. Merged.

								Honza
> 
> Signed-off-by: Namhyung Kim <namhyung@gmail.com>
> ---
>  fs/ext3/resize.c |   13 +++++++------
>  1 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
> index 0ccd7b1..e746d30 100644
> --- a/fs/ext3/resize.c
> +++ b/fs/ext3/resize.c
> @@ -977,7 +977,8 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
>  	o_blocks_count = le32_to_cpu(es->s_blocks_count);
>  
>  	if (test_opt(sb, DEBUG))
> -		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",
> +		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK
> +		       " upto "E3FSBLK" blocks\n",
>  		       o_blocks_count, n_blocks_count);
>  
>  	if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
> @@ -985,7 +986,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
>  
>  	if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) {
>  		printk(KERN_ERR "EXT3-fs: filesystem on %s:"
> -			" too large to resize to %lu blocks safely\n",
> +			" too large to resize to "E3FSBLK" blocks safely\n",
>  			sb->s_id, n_blocks_count);
>  		if (sizeof(sector_t) < 8)
>  			ext3_warning(sb, __func__,
> @@ -1065,11 +1066,11 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
>  	es->s_blocks_count = cpu_to_le32(o_blocks_count + add);
>  	ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
>  	mutex_unlock(&EXT3_SB(sb)->s_resize_lock);
> -	ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,
> -		   o_blocks_count + add);
> +	ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n",
> +		   o_blocks_count, o_blocks_count + add);
>  	ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);
> -	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,
> -		   o_blocks_count + add);
> +	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n",
> +		   o_blocks_count, o_blocks_count + add);
>  	if ((err = ext3_journal_stop(handle)))
>  		goto exit_put;
>  	if (test_opt(sb, DEBUG))
> -- 
> 1.7.0.4
>
Eric Sandeen - Oct. 18, 2010, 2:23 p.m.
Namhyung Kim wrote:
> Fix a typo, break long lines and use E3FSBLK on ext3_fsblk_t.

ext4 could use this treatment as well.

> Signed-off-by: Namhyung Kim <namhyung@gmail.com>
> ---
>  fs/ext3/resize.c |   13 +++++++------
>  1 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
> index 0ccd7b1..e746d30 100644
> --- a/fs/ext3/resize.c
> +++ b/fs/ext3/resize.c
> @@ -977,7 +977,8 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
>  	o_blocks_count = le32_to_cpu(es->s_blocks_count);
>  
>  	if (test_opt(sb, DEBUG))
> -		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",
> +		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK
> +		       " upto "E3FSBLK" blocks\n",
>  		       o_blocks_count, n_blocks_count);
>  
>  	if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
> @@ -985,7 +986,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
>  
>  	if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) {
>  		printk(KERN_ERR "EXT3-fs: filesystem on %s:"
> -			" too large to resize to %lu blocks safely\n",
> +			" too large to resize to "E3FSBLK" blocks safely\n",
>  			sb->s_id, n_blocks_count);
>  		if (sizeof(sector_t) < 8)
>  			ext3_warning(sb, __func__,
> @@ -1065,11 +1066,11 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
>  	es->s_blocks_count = cpu_to_le32(o_blocks_count + add);
>  	ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
>  	mutex_unlock(&EXT3_SB(sb)->s_resize_lock);
> -	ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,
> -		   o_blocks_count + add);
> +	ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n",
> +		   o_blocks_count, o_blocks_count + add);
>  	ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);
> -	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,
> -		   o_blocks_count + add);
> +	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n",
> +		   o_blocks_count, o_blocks_count + add);
>  	if ((err = ext3_journal_stop(handle)))
>  		goto exit_put;
>  	if (test_opt(sb, DEBUG))

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - Oct. 18, 2010, 2:50 p.m.
On Mon, Oct 18, 2010 at 09:23:23AM -0500, Eric Sandeen wrote:
> Namhyung Kim wrote:
> > Fix a typo, break long lines and use E3FSBLK on ext3_fsblk_t.
> 
> ext4 could use this treatment as well.

There's been over a dozen random tiny cleanup patches to jbd.  I've
been waiting for them to die down, and for me to have time, and I was
going to batch them into a single commit (I'm not fond of a whole
series of random cleanup patches that just fix spelling mistakes and
other random code churn).  If someone would like to get to that before
we, it would be much appreciated.

						- Ted


> 
> > Signed-off-by: Namhyung Kim <namhyung@gmail.com>
> > ---
> >  fs/ext3/resize.c |   13 +++++++------
> >  1 files changed, 7 insertions(+), 6 deletions(-)
> > 
> > diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
> > index 0ccd7b1..e746d30 100644
> > --- a/fs/ext3/resize.c
> > +++ b/fs/ext3/resize.c
> > @@ -977,7 +977,8 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
> >  	o_blocks_count = le32_to_cpu(es->s_blocks_count);
> >  
> >  	if (test_opt(sb, DEBUG))
> > -		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",
> > +		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK
> > +		       " upto "E3FSBLK" blocks\n",
> >  		       o_blocks_count, n_blocks_count);
> >  
> >  	if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
> > @@ -985,7 +986,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
> >  
> >  	if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) {
> >  		printk(KERN_ERR "EXT3-fs: filesystem on %s:"
> > -			" too large to resize to %lu blocks safely\n",
> > +			" too large to resize to "E3FSBLK" blocks safely\n",
> >  			sb->s_id, n_blocks_count);
> >  		if (sizeof(sector_t) < 8)
> >  			ext3_warning(sb, __func__,
> > @@ -1065,11 +1066,11 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
> >  	es->s_blocks_count = cpu_to_le32(o_blocks_count + add);
> >  	ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
> >  	mutex_unlock(&EXT3_SB(sb)->s_resize_lock);
> > -	ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,
> > -		   o_blocks_count + add);
> > +	ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n",
> > +		   o_blocks_count, o_blocks_count + add);
> >  	ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);
> > -	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,
> > -		   o_blocks_count + add);
> > +	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n",
> > +		   o_blocks_count, o_blocks_count + add);
> >  	if ((err = ext3_journal_stop(handle)))
> >  		goto exit_put;
> >  	if (test_opt(sb, DEBUG))
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 0ccd7b1..e746d30 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -977,7 +977,8 @@  int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
 	o_blocks_count = le32_to_cpu(es->s_blocks_count);
 
 	if (test_opt(sb, DEBUG))
-		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n",
+		printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK
+		       " upto "E3FSBLK" blocks\n",
 		       o_blocks_count, n_blocks_count);
 
 	if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
@@ -985,7 +986,7 @@  int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
 
 	if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) {
 		printk(KERN_ERR "EXT3-fs: filesystem on %s:"
-			" too large to resize to %lu blocks safely\n",
+			" too large to resize to "E3FSBLK" blocks safely\n",
 			sb->s_id, n_blocks_count);
 		if (sizeof(sector_t) < 8)
 			ext3_warning(sb, __func__,
@@ -1065,11 +1066,11 @@  int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
 	es->s_blocks_count = cpu_to_le32(o_blocks_count + add);
 	ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
 	mutex_unlock(&EXT3_SB(sb)->s_resize_lock);
-	ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count,
-		   o_blocks_count + add);
+	ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n",
+		   o_blocks_count, o_blocks_count + add);
 	ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);
-	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count,
-		   o_blocks_count + add);
+	ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n",
+		   o_blocks_count, o_blocks_count + add);
 	if ((err = ext3_journal_stop(handle)))
 		goto exit_put;
 	if (test_opt(sb, DEBUG))