Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 11b8448751ba114416c63899638a8e473ebd21e7

Authored by Denis Vlasenko
Committed by Linus Torvalds
1 parent d4eb82c783

[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>

Showing 4 changed files with 22 additions and 22 deletions Side-by-side Diff

... ... @@ -56,7 +56,7 @@
56 56 unsigned int bit,zone;
57 57  
58 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 60 return;
61 61 }
62 62 zone = block - sbi->s_firstdatazone + 1;
... ... @@ -124,7 +124,7 @@
124 124 ino / MINIX_INODES_PER_BLOCK;
125 125 *bh = sb_bread(sb, block);
126 126 if (!*bh) {
127   - printk("unable to read i-node block\n");
  127 + printk("Unable to read inode block\n");
128 128 return NULL;
129 129 }
130 130 p = (void *)(*bh)->b_data;
... ... @@ -149,7 +149,7 @@
149 149 ino / MINIX2_INODES_PER_BLOCK;
150 150 *bh = sb_bread(sb, block);
151 151 if (!*bh) {
152   - printk("unable to read i-node block\n");
  152 + printk("Unable to read inode block\n");
153 153 return NULL;
154 154 }
155 155 p = (void *)(*bh)->b_data;
... ... @@ -204,7 +204,7 @@
204 204 bh = sbi->s_imap[ino >> 13];
205 205 lock_kernel();
206 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 208 unlock_kernel();
209 209 mark_buffer_dirty(bh);
210 210 out:
... ... @@ -238,7 +238,7 @@
238 238 return NULL;
239 239 }
240 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 242 unlock_kernel();
243 243 iput(inode);
244 244 return NULL;
... ... @@ -127,11 +127,11 @@
127 127 mark_buffer_dirty(sbi->s_sbh);
128 128  
129 129 if (!(sbi->s_mount_state & MINIX_VALID_FS))
130   - printk ("MINIX-fs warning: remounting unchecked fs, "
131   - "running fsck is recommended.\n");
  130 + printk("MINIX-fs warning: remounting unchecked fs, "
  131 + "running fsck is recommended\n");
132 132 else if ((sbi->s_mount_state & MINIX_ERROR_FS))
133   - printk ("MINIX-fs warning: remounting fs with errors, "
134   - "running fsck is recommended.\n");
  133 + printk("MINIX-fs warning: remounting fs with errors, "
  134 + "running fsck is recommended\n");
135 135 }
136 136 return 0;
137 137 }
138 138  
... ... @@ -245,11 +245,11 @@
245 245 mark_buffer_dirty(bh);
246 246 }
247 247 if (!(sbi->s_mount_state & MINIX_VALID_FS))
248   - printk ("MINIX-fs: mounting unchecked file system, "
249   - "running fsck is recommended.\n");
  248 + printk("MINIX-fs: mounting unchecked file system, "
  249 + "running fsck is recommended\n");
250 250 else if (sbi->s_mount_state & MINIX_ERROR_FS)
251   - printk ("MINIX-fs: mounting file system with errors, "
252   - "running fsck is recommended.\n");
  251 + printk("MINIX-fs: mounting file system with errors, "
  252 + "running fsck is recommended\n");
253 253 return 0;
254 254  
255 255 out_iput:
256 256  
257 257  
... ... @@ -273,19 +273,19 @@
273 273  
274 274 out_no_map:
275 275 if (!silent)
276   - printk ("MINIX-fs: can't allocate map\n");
  276 + printk("MINIX-fs: can't allocate map\n");
277 277 goto out_release;
278 278  
279 279 out_no_fs:
280 280 if (!silent)
281   - printk("VFS: Can't find a Minix or Minix V2 filesystem on device "
282   - "%s.\n", s->s_id);
  281 + printk("VFS: Can't find a Minix or Minix V2 filesystem "
  282 + "on device %s\n", s->s_id);
283 283 out_release:
284 284 brelse(bh);
285 285 goto out;
286 286  
287 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 289 goto out;
290 290  
291 291 out_bad_sb:
... ... @@ -524,7 +524,7 @@
524 524 sync_dirty_buffer(bh);
525 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 528 inode->i_sb->s_id, inode->i_ino);
529 529 err = -1;
530 530 }
... ... @@ -25,9 +25,9 @@
25 25 int n = 0;
26 26  
27 27 if (block < 0) {
28   - printk("minix_bmap: block<0");
  28 + printk("minix_bmap: block<0\n");
29 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 31 } else if (block < 7) {
32 32 offsets[n++] = block;
33 33 } else if ((block -= 7) < 512) {
... ... @@ -25,9 +25,9 @@
25 25 int n = 0;
26 26  
27 27 if (block < 0) {
28   - printk("minix_bmap: block<0");
  28 + printk("minix_bmap: block<0\n");
29 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 31 } else if (block < 7) {
32 32 offsets[n++] = block;
33 33 } else if ((block -= 7) < 256) {