Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f40668d authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Linus Torvalds
Browse files

[PATCH] ext3: remove trailing newlines from ext3_warning() calls 



Remove the trailing newlines in calls to ext3_warning().  This function
already adds a trailing newline to the end of messages.

Signed-off-by: default avatarGlauber de Oliveira Costa <glommer@br.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 25ab7cd8

fs/ext3/ialloc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -651,7 +651,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) 
	/* Error cases - e2fsck has already cleaned up for us */

	/* Error cases - e2fsck has already cleaned up for us */

	if (ino > max_ino) {

	if (ino > max_ino) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "bad orphan ino %lu!  e2fsck was run?\n", ino);

			     "bad orphan ino %lu!  e2fsck was run?", ino);

		goto out;

		goto out;

	}

	}
@@ -660,7 +660,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) 
	bitmap_bh = read_inode_bitmap(sb, block_group);

	bitmap_bh = read_inode_bitmap(sb, block_group);

	if (!bitmap_bh) {

	if (!bitmap_bh) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "inode bitmap error for orphan %lu\n", ino);

			     "inode bitmap error for orphan %lu", ino);

		goto out;

		goto out;

	}

	}
@@ -672,7 +672,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) 
			!(inode = iget(sb, ino)) || is_bad_inode(inode) ||

			!(inode = iget(sb, ino)) || is_bad_inode(inode) ||

			NEXT_ORPHAN(inode) > max_ino) {

			NEXT_ORPHAN(inode) > max_ino) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "bad orphan inode %lu!  e2fsck was run?\n", ino);

			     "bad orphan inode %lu!  e2fsck was run?", ino);

		printk(KERN_NOTICE "ext3_test_bit(bit=%d, block=%llu) = %d\n",

		printk(KERN_NOTICE "ext3_test_bit(bit=%d, block=%llu) = %d\n",

		       bit, (unsigned long long)bitmap_bh->b_blocknr,

		       bit, (unsigned long long)bitmap_bh->b_blocknr,

		       ext3_test_bit(bit, bitmap_bh->b_data));

		       ext3_test_bit(bit, bitmap_bh->b_data));

fs/ext3/namei.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1476,7 +1476,7 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry, 
		if (levels && (dx_get_count(frames->entries) ==

		if (levels && (dx_get_count(frames->entries) ==

			       dx_get_limit(frames->entries))) {

			       dx_get_limit(frames->entries))) {

			ext3_warning(sb, __FUNCTION__,

			ext3_warning(sb, __FUNCTION__,

				     "Directory index full!\n");

				     "Directory index full!");

			err = -ENOSPC;

			err = -ENOSPC;

			goto cleanup;

			goto cleanup;

		}

		}

fs/ext3/resize.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -340,7 +340,7 @@ static int verify_reserved_gdb(struct super_block *sb, 
	while ((grp = ext3_list_backups(sb, &three, &five, &seven)) < end) {

	while ((grp = ext3_list_backups(sb, &three, &five, &seven)) < end) {

		if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){

		if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){

			ext3_warning(sb, __FUNCTION__,

			ext3_warning(sb, __FUNCTION__,

				     "reserved GDT %ld missing grp %d (%ld)\n",

				     "reserved GDT %ld missing grp %d (%ld)",

				     blk, grp,

				     blk, grp,

				     grp * EXT3_BLOCKS_PER_GROUP(sb) + blk);

				     grp * EXT3_BLOCKS_PER_GROUP(sb) + blk);

			return -EINVAL;

			return -EINVAL;
@@ -393,7 +393,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	if (EXT3_SB(sb)->s_sbh->b_blocknr !=

	if (EXT3_SB(sb)->s_sbh->b_blocknr !=

	    le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block)) {

	    le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block)) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			"won't resize using backup superblock at %llu\n",

			"won't resize using backup superblock at %llu",

			(unsigned long long)EXT3_SB(sb)->s_sbh->b_blocknr);

			(unsigned long long)EXT3_SB(sb)->s_sbh->b_blocknr);

		return -EPERM;

		return -EPERM;

	}

	}
@@ -417,7 +417,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	data = (__u32 *)dind->b_data;

	data = (__u32 *)dind->b_data;

	if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) {

	if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "new group %u GDT block %lu not reserved\n",

			     "new group %u GDT block %lu not reserved",

			     input->group, gdblock);

			     input->group, gdblock);

		err = -EINVAL;

		err = -EINVAL;

		goto exit_dind;

		goto exit_dind;
@@ -540,7 +540,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, 
	for (res = 0; res < reserved_gdb; res++, blk++) {

	for (res = 0; res < reserved_gdb; res++, blk++) {

		if (le32_to_cpu(*data) != blk) {

		if (le32_to_cpu(*data) != blk) {

			ext3_warning(sb, __FUNCTION__,

			ext3_warning(sb, __FUNCTION__,

				     "reserved block %lu not at offset %ld\n",

				     "reserved block %lu not at offset %ld",

				     blk, (long)(data - (__u32 *)dind->b_data));

				     blk, (long)(data - (__u32 *)dind->b_data));

			err = -EINVAL;

			err = -EINVAL;

			goto exit_bh;

			goto exit_bh;
@@ -683,7 +683,7 @@ static void update_backups(struct super_block *sb, 
	if (err) {

	if (err) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "can't update backup for group %d (err %d), "

			     "can't update backup for group %d (err %d), "

			     "forcing fsck on next reboot\n", group, err);

			     "forcing fsck on next reboot", group, err);

		sbi->s_mount_state &= ~EXT3_VALID_FS;

		sbi->s_mount_state &= ~EXT3_VALID_FS;

		sbi->s_es->s_state &= ~cpu_to_le16(EXT3_VALID_FS);

		sbi->s_es->s_state &= ~cpu_to_le16(EXT3_VALID_FS);

		mark_buffer_dirty(sbi->s_sbh);

		mark_buffer_dirty(sbi->s_sbh);
@@ -722,7 +722,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) 
	if (gdb_off == 0 && !EXT3_HAS_RO_COMPAT_FEATURE(sb,

	if (gdb_off == 0 && !EXT3_HAS_RO_COMPAT_FEATURE(sb,

					EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER)) {

					EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER)) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "Can't resize non-sparse filesystem further\n");

			     "Can't resize non-sparse filesystem further");

		return -EPERM;

		return -EPERM;

	}

	}
@@ -730,13 +730,13 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) 
		if (!EXT3_HAS_COMPAT_FEATURE(sb,

		if (!EXT3_HAS_COMPAT_FEATURE(sb,

					     EXT3_FEATURE_COMPAT_RESIZE_INODE)){

					     EXT3_FEATURE_COMPAT_RESIZE_INODE)){

			ext3_warning(sb, __FUNCTION__,

			ext3_warning(sb, __FUNCTION__,

				     "No reserved GDT blocks, can't resize\n");

				     "No reserved GDT blocks, can't resize");

			return -EPERM;

			return -EPERM;

		}

		}

		inode = iget(sb, EXT3_RESIZE_INO);

		inode = iget(sb, EXT3_RESIZE_INO);

		if (!inode || is_bad_inode(inode)) {

		if (!inode || is_bad_inode(inode)) {

			ext3_warning(sb, __FUNCTION__,

			ext3_warning(sb, __FUNCTION__,

				     "Error opening resize inode\n");

				     "Error opening resize inode");

			iput(inode);

			iput(inode);

			return -ENOENT;

			return -ENOENT;

		}

		}
@@ -766,7 +766,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) 
	lock_super(sb);

	lock_super(sb);

	if (input->group != EXT3_SB(sb)->s_groups_count) {

	if (input->group != EXT3_SB(sb)->s_groups_count) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "multiple resizers run on filesystem!\n");

			     "multiple resizers run on filesystem!");

		err = -EBUSY;

		err = -EBUSY;

		goto exit_journal;

		goto exit_journal;

	}

	}
@@ -937,7 +937,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, 




	if (last == 0) {

	if (last == 0) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "need to use ext2online to resize further\n");

			     "need to use ext2online to resize further");

		return -EPERM;

		return -EPERM;

	}

	}
@@ -973,7 +973,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, 
	lock_super(sb);

	lock_super(sb);

	if (o_blocks_count != le32_to_cpu(es->s_blocks_count)) {

	if (o_blocks_count != le32_to_cpu(es->s_blocks_count)) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __FUNCTION__,

			     "multiple resizers run on filesystem!\n");

			     "multiple resizers run on filesystem!");

		err = -EBUSY;

		err = -EBUSY;

		goto exit_put;

		goto exit_put;

	}

	}