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

Commit 11b84487 authored by Denis Vlasenko's avatar Denis Vlasenko Committed by Linus Torvalds
Browse files

[PATCH] fix messages in fs/minix 



Believe it or not, but in fs/minix/*, the oldest filesystem in the kernel,
something still can be fixed:

	printk("new_inode: bit already set");

"\n" is missing!

While at it, I also removed periods from the end of error messages and made
capitalization uniform.  Also s/i-node/inode/, s/printk (/printk(/

Signed-ff-by: default avatarDenis Vlasenko <vda@ilport.com.ua>

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d4eb82c7

fs/minix/bitmap.c

+5 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void minix_free_block(struct inode * inode, int block) 
	unsigned int bit,zone;



	if (block < sbi->s_firstdatazone || block >= sbi->s_nzones) {

		printk("trying to free block not in datazone\n");

		printk("Trying to free block not in datazone\n");

		return;

	}

	zone = block - sbi->s_firstdatazone + 1;
@@ -124,7 +124,7 @@ minix_V1_raw_inode(struct super_block *sb, ino_t ino, struct buffer_head **bh) 
		 ino / MINIX_INODES_PER_BLOCK;

	*bh = sb_bread(sb, block);

	if (!*bh) {

		printk("unable to read i-node block\n");

		printk("Unable to read inode block\n");

		return NULL;

	}

	p = (void *)(*bh)->b_data;
@@ -149,7 +149,7 @@ minix_V2_raw_inode(struct super_block *sb, ino_t ino, struct buffer_head **bh) 
		 ino / MINIX2_INODES_PER_BLOCK;

	*bh = sb_bread(sb, block);

	if (!*bh) {

		printk("unable to read i-node block\n");

		printk("Unable to read inode block\n");

		return NULL;

	}

	p = (void *)(*bh)->b_data;
@@ -204,7 +204,7 @@ void minix_free_inode(struct inode * inode) 
	bh = sbi->s_imap[ino >> 13];

	lock_kernel();

	if (!minix_test_and_clear_bit(ino & 8191, bh->b_data))

		printk("minix_free_inode: bit %lu already cleared.\n", ino);

		printk("minix_free_inode: bit %lu already cleared\n", ino);

	unlock_kernel();

	mark_buffer_dirty(bh);

 out:
@@ -238,7 +238,7 @@ struct inode * minix_new_inode(const struct inode * dir, int * error) 
		return NULL;

	}

	if (minix_test_and_set_bit(j,bh->b_data)) {	/* shouldn't happen */

		printk("new_inode: bit already set");

		printk("new_inode: bit already set\n");

		unlock_kernel();

		iput(inode);

		return NULL;

fs/minix/inode.c

+13 −13
Original line number Diff line number Diff line
@@ -128,10 +128,10 @@ static int minix_remount (struct super_block * sb, int * flags, char * data) 


		if (!(sbi->s_mount_state & MINIX_VALID_FS))

			printk("MINIX-fs warning: remounting unchecked fs, "

				"running fsck is recommended.\n");

				"running fsck is recommended\n");

		else if ((sbi->s_mount_state & MINIX_ERROR_FS))

			printk("MINIX-fs warning: remounting fs with errors, "

				"running fsck is recommended.\n");

				"running fsck is recommended\n");

	}

	return 0;

}
@@ -246,10 +246,10 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) 
	}

	if (!(sbi->s_mount_state & MINIX_VALID_FS))

		printk("MINIX-fs: mounting unchecked file system, "

			"running fsck is recommended.\n");

			"running fsck is recommended\n");

 	else if (sbi->s_mount_state & MINIX_ERROR_FS)

		printk("MINIX-fs: mounting file system with errors, "

			"running fsck is recommended.\n");

			"running fsck is recommended\n");

	return 0;



out_iput:
@@ -278,14 +278,14 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) 


out_no_fs:

	if (!silent)

		printk("VFS: Can't find a Minix or Minix V2 filesystem on device "

		       "%s.\n", s->s_id);

		printk("VFS: Can't find a Minix or Minix V2 filesystem "

			"on device %s\n", s->s_id);

    out_release:

	brelse(bh);

	goto out;



out_bad_hblock:

	printk("MINIX-fs: blocksize too small for device.\n");

	printk("MINIX-fs: blocksize too small for device\n");

	goto out;



out_bad_sb:

fs/minix/itree_v1.c

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) 
	int n = 0;



	if (block < 0) {

		printk("minix_bmap: block<0");

		printk("minix_bmap: block<0\n");

	} else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) {

		printk("minix_bmap: block>big");

		printk("minix_bmap: block>big\n");

	} else if (block < 7) {

		offsets[n++] = block;

	} else if ((block -= 7) < 512) {

fs/minix/itree_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) 
	int n = 0;



	if (block < 0) {

		printk("minix_bmap: block<0");

		printk("minix_bmap: block<0\n");

	} else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) {

		printk("minix_bmap: block>big");

		printk("minix_bmap: block>big\n");

	} else if (block < 7) {

		offsets[n++] = block;

	} else if ((block -= 7) < 256) {