diff options
| author | Denis Vlasenko <vda@ilport.com.ua> | 2006-03-25 06:07:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:22:56 -0500 |
| commit | 11b8448751ba114416c63899638a8e473ebd21e7 (patch) | |
| tree | 18ae22ae2a30a35729881ea5b05f7dca12c4439c | |
| parent | d4eb82c783992551c574580eb55fddc8bb006ad0 (diff) | |
[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: Denis Vlasenko <vda@ilport.com.ua>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/minix/bitmap.c | 10 | ||||
| -rw-r--r-- | fs/minix/inode.c | 26 | ||||
| -rw-r--r-- | fs/minix/itree_v1.c | 4 | ||||
| -rw-r--r-- | fs/minix/itree_v2.c | 4 |
4 files changed, 22 insertions, 22 deletions
diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c index dc6a4e4abcdc..4a6abc49418e 100644 --- a/fs/minix/bitmap.c +++ b/fs/minix/bitmap.c | |||
| @@ -56,7 +56,7 @@ void minix_free_block(struct inode * inode, int block) | |||
| 56 | unsigned int bit,zone; | 56 | unsigned int bit,zone; |
| 57 | 57 | ||
| 58 | if (block < sbi->s_firstdatazone || block >= sbi->s_nzones) { | 58 | if (block < sbi->s_firstdatazone || block >= sbi->s_nzones) { |
| 59 | printk("trying to free block not in datazone\n"); | 59 | printk("Trying to free block not in datazone\n"); |
| 60 | return; | 60 | return; |
| 61 | } | 61 | } |
| 62 | zone = block - sbi->s_firstdatazone + 1; | 62 | 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) | |||
| 124 | ino / MINIX_INODES_PER_BLOCK; | 124 | ino / MINIX_INODES_PER_BLOCK; |
| 125 | *bh = sb_bread(sb, block); | 125 | *bh = sb_bread(sb, block); |
| 126 | if (!*bh) { | 126 | if (!*bh) { |
| 127 | printk("unable to read i-node block\n"); | 127 | printk("Unable to read inode block\n"); |
| 128 | return NULL; | 128 | return NULL; |
| 129 | } | 129 | } |
| 130 | p = (void *)(*bh)->b_data; | 130 | p = (void *)(*bh)->b_data; |
| @@ -149,7 +149,7 @@ minix_V2_raw_inode(struct super_block *sb, ino_t ino, struct buffer_head **bh) | |||
| 149 | ino / MINIX2_INODES_PER_BLOCK; | 149 | ino / MINIX2_INODES_PER_BLOCK; |
| 150 | *bh = sb_bread(sb, block); | 150 | *bh = sb_bread(sb, block); |
| 151 | if (!*bh) { | 151 | if (!*bh) { |
| 152 | printk("unable to read i-node block\n"); | 152 | printk("Unable to read inode block\n"); |
| 153 | return NULL; | 153 | return NULL; |
| 154 | } | 154 | } |
| 155 | p = (void *)(*bh)->b_data; | 155 | p = (void *)(*bh)->b_data; |
| @@ -204,7 +204,7 @@ void minix_free_inode(struct inode * inode) | |||
| 204 | bh = sbi->s_imap[ino >> 13]; | 204 | bh = sbi->s_imap[ino >> 13]; |
| 205 | lock_kernel(); | 205 | lock_kernel(); |
| 206 | if (!minix_test_and_clear_bit(ino & 8191, bh->b_data)) | 206 | if (!minix_test_and_clear_bit(ino & 8191, bh->b_data)) |
| 207 | printk("minix_free_inode: bit %lu already cleared.\n", ino); | 207 | printk("minix_free_inode: bit %lu already cleared\n", ino); |
| 208 | unlock_kernel(); | 208 | unlock_kernel(); |
| 209 | mark_buffer_dirty(bh); | 209 | mark_buffer_dirty(bh); |
| 210 | out: | 210 | out: |
| @@ -238,7 +238,7 @@ struct inode * minix_new_inode(const struct inode * dir, int * error) | |||
| 238 | return NULL; | 238 | return NULL; |
| 239 | } | 239 | } |
| 240 | if (minix_test_and_set_bit(j,bh->b_data)) { /* shouldn't happen */ | 240 | if (minix_test_and_set_bit(j,bh->b_data)) { /* shouldn't happen */ |
| 241 | printk("new_inode: bit already set"); | 241 | printk("new_inode: bit already set\n"); |
| 242 | unlock_kernel(); | 242 | unlock_kernel(); |
| 243 | iput(inode); | 243 | iput(inode); |
| 244 | return NULL; | 244 | return NULL; |
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index d9ffc43fee59..2dcccf1d1b7f 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
| @@ -127,11 +127,11 @@ static int minix_remount (struct super_block * sb, int * flags, char * data) | |||
| 127 | mark_buffer_dirty(sbi->s_sbh); | 127 | mark_buffer_dirty(sbi->s_sbh); |
| 128 | 128 | ||
| 129 | if (!(sbi->s_mount_state & MINIX_VALID_FS)) | 129 | if (!(sbi->s_mount_state & MINIX_VALID_FS)) |
| 130 | printk ("MINIX-fs warning: remounting unchecked fs, " | 130 | printk("MINIX-fs warning: remounting unchecked fs, " |
| 131 | "running fsck is recommended.\n"); | 131 | "running fsck is recommended\n"); |
| 132 | else if ((sbi->s_mount_state & MINIX_ERROR_FS)) | 132 | else if ((sbi->s_mount_state & MINIX_ERROR_FS)) |
| 133 | printk ("MINIX-fs warning: remounting fs with errors, " | 133 | printk("MINIX-fs warning: remounting fs with errors, " |
| 134 | "running fsck is recommended.\n"); | 134 | "running fsck is recommended\n"); |
| 135 | } | 135 | } |
| 136 | return 0; | 136 | return 0; |
| 137 | } | 137 | } |
| @@ -245,11 +245,11 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) | |||
| 245 | mark_buffer_dirty(bh); | 245 | mark_buffer_dirty(bh); |
| 246 | } | 246 | } |
| 247 | if (!(sbi->s_mount_state & MINIX_VALID_FS)) | 247 | if (!(sbi->s_mount_state & MINIX_VALID_FS)) |
| 248 | printk ("MINIX-fs: mounting unchecked file system, " | 248 | printk("MINIX-fs: mounting unchecked file system, " |
| 249 | "running fsck is recommended.\n"); | 249 | "running fsck is recommended\n"); |
| 250 | else if (sbi->s_mount_state & MINIX_ERROR_FS) | 250 | else if (sbi->s_mount_state & MINIX_ERROR_FS) |
| 251 | printk ("MINIX-fs: mounting file system with errors, " | 251 | printk("MINIX-fs: mounting file system with errors, " |
| 252 | "running fsck is recommended.\n"); | 252 | "running fsck is recommended\n"); |
| 253 | return 0; | 253 | return 0; |
| 254 | 254 | ||
| 255 | out_iput: | 255 | out_iput: |
| @@ -273,19 +273,19 @@ out_no_bitmap: | |||
| 273 | 273 | ||
| 274 | out_no_map: | 274 | out_no_map: |
| 275 | if (!silent) | 275 | if (!silent) |
| 276 | printk ("MINIX-fs: can't allocate map\n"); | 276 | printk("MINIX-fs: can't allocate map\n"); |
| 277 | goto out_release; | 277 | goto out_release; |
| 278 | 278 | ||
| 279 | out_no_fs: | 279 | out_no_fs: |
| 280 | if (!silent) | 280 | if (!silent) |
| 281 | printk("VFS: Can't find a Minix or Minix V2 filesystem on device " | 281 | printk("VFS: Can't find a Minix or Minix V2 filesystem " |
| 282 | "%s.\n", s->s_id); | 282 | "on device %s\n", s->s_id); |
| 283 | out_release: | 283 | out_release: |
| 284 | brelse(bh); | 284 | brelse(bh); |
| 285 | goto out; | 285 | goto out; |
| 286 | 286 | ||
| 287 | out_bad_hblock: | 287 | out_bad_hblock: |
| 288 | printk("MINIX-fs: blocksize too small for device.\n"); | 288 | printk("MINIX-fs: blocksize too small for device\n"); |
| 289 | goto out; | 289 | goto out; |
| 290 | 290 | ||
| 291 | out_bad_sb: | 291 | out_bad_sb: |
| @@ -524,7 +524,7 @@ int minix_sync_inode(struct inode * inode) | |||
| 524 | sync_dirty_buffer(bh); | 524 | sync_dirty_buffer(bh); |
| 525 | if (buffer_req(bh) && !buffer_uptodate(bh)) | 525 | if (buffer_req(bh) && !buffer_uptodate(bh)) |
| 526 | { | 526 | { |
| 527 | printk ("IO error syncing minix inode [%s:%08lx]\n", | 527 | printk("IO error syncing minix inode [%s:%08lx]\n", |
| 528 | inode->i_sb->s_id, inode->i_ino); | 528 | inode->i_sb->s_id, inode->i_ino); |
| 529 | err = -1; | 529 | err = -1; |
| 530 | } | 530 | } |
diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c index ba06aef4aca1..656b1347a25b 100644 --- a/fs/minix/itree_v1.c +++ b/fs/minix/itree_v1.c | |||
| @@ -25,9 +25,9 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) | |||
| 25 | int n = 0; | 25 | int n = 0; |
| 26 | 26 | ||
| 27 | if (block < 0) { | 27 | if (block < 0) { |
| 28 | printk("minix_bmap: block<0"); | 28 | printk("minix_bmap: block<0\n"); |
| 29 | } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { | 29 | } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { |
| 30 | printk("minix_bmap: block>big"); | 30 | printk("minix_bmap: block>big\n"); |
| 31 | } else if (block < 7) { | 31 | } else if (block < 7) { |
| 32 | offsets[n++] = block; | 32 | offsets[n++] = block; |
| 33 | } else if ((block -= 7) < 512) { | 33 | } else if ((block -= 7) < 512) { |
diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c index 3adc7675560f..9adcdc754e0f 100644 --- a/fs/minix/itree_v2.c +++ b/fs/minix/itree_v2.c | |||
| @@ -25,9 +25,9 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) | |||
| 25 | int n = 0; | 25 | int n = 0; |
| 26 | 26 | ||
| 27 | if (block < 0) { | 27 | if (block < 0) { |
| 28 | printk("minix_bmap: block<0"); | 28 | printk("minix_bmap: block<0\n"); |
| 29 | } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { | 29 | } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { |
| 30 | printk("minix_bmap: block>big"); | 30 | printk("minix_bmap: block>big\n"); |
| 31 | } else if (block < 7) { | 31 | } else if (block < 7) { |
| 32 | offsets[n++] = block; | 32 | offsets[n++] = block; |
| 33 | } else if ((block -= 7) < 256) { | 33 | } else if ((block -= 7) < 256) { |
