aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-08-08 17:23:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:25 -0400
commite00d5b5ad70c6c4fb978fe843c0bbb3294d63223 (patch)
tree41a5b76e1e8719c8249ad2359aff2cf5ee7344f7 /fs
parentb6d53b1b113492632bdc37ee9ab1dda8b9a4bf34 (diff)
fs/qnx6: convert printk to pr_foo()
Use current logging functions. Coalesce formats. Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Joe Perches <joe@perches.com> Cc: Kai Bankett <chaosman@ontika.net> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/qnx6/dir.c14
-rw-r--r--fs/qnx6/inode.c62
-rw-r--r--fs/qnx6/super_mmi.c22
3 files changed, 43 insertions, 55 deletions
diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c
index 15b7d92ed60d..2289ea180d44 100644
--- a/fs/qnx6/dir.c
+++ b/fs/qnx6/dir.c
@@ -77,13 +77,12 @@ static int qnx6_dir_longfilename(struct inode *inode,
77 if (de->de_size != 0xff) { 77 if (de->de_size != 0xff) {
78 /* error - long filename entries always have size 0xff 78 /* error - long filename entries always have size 0xff
79 in direntry */ 79 in direntry */
80 printk(KERN_ERR "qnx6: invalid direntry size (%i).\n", 80 pr_err("qnx6: invalid direntry size (%i).\n", de->de_size);
81 de->de_size);
82 return 0; 81 return 0;
83 } 82 }
84 lf = qnx6_longname(s, de, &page); 83 lf = qnx6_longname(s, de, &page);
85 if (IS_ERR(lf)) { 84 if (IS_ERR(lf)) {
86 printk(KERN_ERR "qnx6:Error reading longname\n"); 85 pr_err("qnx6:Error reading longname\n");
87 return 0; 86 return 0;
88 } 87 }
89 88
@@ -91,7 +90,7 @@ static int qnx6_dir_longfilename(struct inode *inode,
91 90
92 if (lf_size > QNX6_LONG_NAME_MAX) { 91 if (lf_size > QNX6_LONG_NAME_MAX) {
93 QNX6DEBUG((KERN_INFO "file %s\n", lf->lf_fname)); 92 QNX6DEBUG((KERN_INFO "file %s\n", lf->lf_fname));
94 printk(KERN_ERR "qnx6:Filename too long (%i)\n", lf_size); 93 pr_err("qnx6:Filename too long (%i)\n", lf_size);
95 qnx6_put_page(page); 94 qnx6_put_page(page);
96 return 0; 95 return 0;
97 } 96 }
@@ -100,7 +99,7 @@ static int qnx6_dir_longfilename(struct inode *inode,
100 mmi 3g filesystem does not have that checksum */ 99 mmi 3g filesystem does not have that checksum */
101 if (!test_opt(s, MMI_FS) && fs32_to_cpu(sbi, de->de_checksum) != 100 if (!test_opt(s, MMI_FS) && fs32_to_cpu(sbi, de->de_checksum) !=
102 qnx6_lfile_checksum(lf->lf_fname, lf_size)) 101 qnx6_lfile_checksum(lf->lf_fname, lf_size))
103 printk(KERN_INFO "qnx6: long filename checksum error.\n"); 102 pr_info("qnx6: long filename checksum error.\n");
104 103
105 QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n", 104 QNX6DEBUG((KERN_INFO "qnx6_readdir:%.*s inode:%u\n",
106 lf_size, lf->lf_fname, de_inode)); 105 lf_size, lf->lf_fname, de_inode));
@@ -136,7 +135,7 @@ static int qnx6_readdir(struct file *file, struct dir_context *ctx)
136 int i = start; 135 int i = start;
137 136
138 if (IS_ERR(page)) { 137 if (IS_ERR(page)) {
139 printk(KERN_ERR "qnx6_readdir: read failed\n"); 138 pr_err("qnx6_readdir: read failed\n");
140 ctx->pos = (n + 1) << PAGE_CACHE_SHIFT; 139 ctx->pos = (n + 1) << PAGE_CACHE_SHIFT;
141 return PTR_ERR(page); 140 return PTR_ERR(page);
142 } 141 }
@@ -259,8 +258,7 @@ unsigned qnx6_find_entry(int len, struct inode *dir, const char *name,
259 if (ino) 258 if (ino)
260 goto found; 259 goto found;
261 } else 260 } else
262 printk(KERN_ERR "qnx6: undefined " 261 pr_err("qnx6: undefined filename size in inode.\n");
263 "filename size in inode.\n");
264 } 262 }
265 qnx6_put_page(page); 263 qnx6_put_page(page);
266 } 264 }
diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c
index 65cdaab3ed49..0042af9a607c 100644
--- a/fs/qnx6/inode.c
+++ b/fs/qnx6/inode.c
@@ -87,7 +87,7 @@ static int qnx6_get_block(struct inode *inode, sector_t iblock,
87static int qnx6_check_blockptr(__fs32 ptr) 87static int qnx6_check_blockptr(__fs32 ptr)
88{ 88{
89 if (ptr == ~(__fs32)0) { 89 if (ptr == ~(__fs32)0) {
90 printk(KERN_ERR "qnx6: hit unused blockpointer.\n"); 90 pr_err("qnx6: hit unused blockpointer.\n");
91 return 0; 91 return 0;
92 } 92 }
93 return 1; 93 return 1;
@@ -127,8 +127,7 @@ static unsigned qnx6_block_map(struct inode *inode, unsigned no)
127 levelptr = no >> bitdelta; 127 levelptr = no >> bitdelta;
128 128
129 if (levelptr > QNX6_NO_DIRECT_POINTERS - 1) { 129 if (levelptr > QNX6_NO_DIRECT_POINTERS - 1) {
130 printk(KERN_ERR "qnx6:Requested file block number (%u) too big.", 130 pr_err("qnx6:Requested file block number (%u) too big.", no);
131 no);
132 return 0; 131 return 0;
133 } 132 }
134 133
@@ -137,8 +136,7 @@ static unsigned qnx6_block_map(struct inode *inode, unsigned no)
137 for (i = 0; i < depth; i++) { 136 for (i = 0; i < depth; i++) {
138 bh = sb_bread(s, block); 137 bh = sb_bread(s, block);
139 if (!bh) { 138 if (!bh) {
140 printk(KERN_ERR "qnx6:Error reading block (%u)\n", 139 pr_err("qnx6:Error reading block (%u)\n", block);
141 block);
142 return 0; 140 return 0;
143 } 141 }
144 bitdelta -= ptrbits; 142 bitdelta -= ptrbits;
@@ -277,7 +275,7 @@ static struct buffer_head *qnx6_check_first_superblock(struct super_block *s,
277 start with the first superblock */ 275 start with the first superblock */
278 bh = sb_bread(s, offset); 276 bh = sb_bread(s, offset);
279 if (!bh) { 277 if (!bh) {
280 printk(KERN_ERR "qnx6: unable to read the first superblock\n"); 278 pr_err("qnx6: unable to read the first superblock\n");
281 return NULL; 279 return NULL;
282 } 280 }
283 sb = (struct qnx6_super_block *)bh->b_data; 281 sb = (struct qnx6_super_block *)bh->b_data;
@@ -292,13 +290,10 @@ static struct buffer_head *qnx6_check_first_superblock(struct super_block *s,
292 sbi->s_bytesex = BYTESEX_LE; 290 sbi->s_bytesex = BYTESEX_LE;
293 if (!silent) { 291 if (!silent) {
294 if (offset == 0) { 292 if (offset == 0) {
295 printk(KERN_ERR "qnx6: wrong signature (magic)" 293 pr_err("qnx6: wrong signature (magic) in superblock #1.\n");
296 " in superblock #1.\n");
297 } else { 294 } else {
298 printk(KERN_INFO "qnx6: wrong signature (magic)" 295 pr_info("qnx6: wrong signature (magic) at position (0x%lx) - will try alternative position (0x0000).\n",
299 " at position (0x%lx) - will try" 296 offset * s->s_blocksize);
300 " alternative position (0x0000).\n",
301 offset * s->s_blocksize);
302 } 297 }
303 } 298 }
304 brelse(bh); 299 brelse(bh);
@@ -329,13 +324,13 @@ static int qnx6_fill_super(struct super_block *s, void *data, int silent)
329 324
330 /* Superblock always is 512 Byte long */ 325 /* Superblock always is 512 Byte long */
331 if (!sb_set_blocksize(s, QNX6_SUPERBLOCK_SIZE)) { 326 if (!sb_set_blocksize(s, QNX6_SUPERBLOCK_SIZE)) {
332 printk(KERN_ERR "qnx6: unable to set blocksize\n"); 327 pr_err("qnx6: unable to set blocksize\n");
333 goto outnobh; 328 goto outnobh;
334 } 329 }
335 330
336 /* parse the mount-options */ 331 /* parse the mount-options */
337 if (!qnx6_parse_options((char *) data, s)) { 332 if (!qnx6_parse_options((char *) data, s)) {
338 printk(KERN_ERR "qnx6: invalid mount options.\n"); 333 pr_err("qnx6: invalid mount options.\n");
339 goto outnobh; 334 goto outnobh;
340 } 335 }
341 if (test_opt(s, MMI_FS)) { 336 if (test_opt(s, MMI_FS)) {
@@ -355,7 +350,7 @@ static int qnx6_fill_super(struct super_block *s, void *data, int silent)
355 /* try again without bootblock offset */ 350 /* try again without bootblock offset */
356 bh1 = qnx6_check_first_superblock(s, 0, silent); 351 bh1 = qnx6_check_first_superblock(s, 0, silent);
357 if (!bh1) { 352 if (!bh1) {
358 printk(KERN_ERR "qnx6: unable to read the first superblock\n"); 353 pr_err("qnx6: unable to read the first superblock\n");
359 goto outnobh; 354 goto outnobh;
360 } 355 }
361 /* seems that no bootblock at partition start */ 356 /* seems that no bootblock at partition start */
@@ -370,13 +365,13 @@ static int qnx6_fill_super(struct super_block *s, void *data, int silent)
370 /* checksum check - start at byte 8 and end at byte 512 */ 365 /* checksum check - start at byte 8 and end at byte 512 */
371 if (fs32_to_cpu(sbi, sb1->sb_checksum) != 366 if (fs32_to_cpu(sbi, sb1->sb_checksum) !=
372 crc32_be(0, (char *)(bh1->b_data + 8), 504)) { 367 crc32_be(0, (char *)(bh1->b_data + 8), 504)) {
373 printk(KERN_ERR "qnx6: superblock #1 checksum error\n"); 368 pr_err("qnx6: superblock #1 checksum error\n");
374 goto out; 369 goto out;
375 } 370 }
376 371
377 /* set new blocksize */ 372 /* set new blocksize */
378 if (!sb_set_blocksize(s, fs32_to_cpu(sbi, sb1->sb_blocksize))) { 373 if (!sb_set_blocksize(s, fs32_to_cpu(sbi, sb1->sb_blocksize))) {
379 printk(KERN_ERR "qnx6: unable to set blocksize\n"); 374 pr_err("qnx6: unable to set blocksize\n");
380 goto out; 375 goto out;
381 } 376 }
382 /* blocksize invalidates bh - pull it back in */ 377 /* blocksize invalidates bh - pull it back in */
@@ -398,21 +393,20 @@ static int qnx6_fill_super(struct super_block *s, void *data, int silent)
398 /* next the second superblock */ 393 /* next the second superblock */
399 bh2 = sb_bread(s, offset); 394 bh2 = sb_bread(s, offset);
400 if (!bh2) { 395 if (!bh2) {
401 printk(KERN_ERR "qnx6: unable to read the second superblock\n"); 396 pr_err("qnx6: unable to read the second superblock\n");
402 goto out; 397 goto out;
403 } 398 }
404 sb2 = (struct qnx6_super_block *)bh2->b_data; 399 sb2 = (struct qnx6_super_block *)bh2->b_data;
405 if (fs32_to_cpu(sbi, sb2->sb_magic) != QNX6_SUPER_MAGIC) { 400 if (fs32_to_cpu(sbi, sb2->sb_magic) != QNX6_SUPER_MAGIC) {
406 if (!silent) 401 if (!silent)
407 printk(KERN_ERR "qnx6: wrong signature (magic)" 402 pr_err("qnx6: wrong signature (magic) in superblock #2.\n");
408 " in superblock #2.\n");
409 goto out; 403 goto out;
410 } 404 }
411 405
412 /* checksum check - start at byte 8 and end at byte 512 */ 406 /* checksum check - start at byte 8 and end at byte 512 */
413 if (fs32_to_cpu(sbi, sb2->sb_checksum) != 407 if (fs32_to_cpu(sbi, sb2->sb_checksum) !=
414 crc32_be(0, (char *)(bh2->b_data + 8), 504)) { 408 crc32_be(0, (char *)(bh2->b_data + 8), 504)) {
415 printk(KERN_ERR "qnx6: superblock #2 checksum error\n"); 409 pr_err("qnx6: superblock #2 checksum error\n");
416 goto out; 410 goto out;
417 } 411 }
418 412
@@ -422,25 +416,24 @@ static int qnx6_fill_super(struct super_block *s, void *data, int silent)
422 sbi->sb_buf = bh1; 416 sbi->sb_buf = bh1;
423 sbi->sb = (struct qnx6_super_block *)bh1->b_data; 417 sbi->sb = (struct qnx6_super_block *)bh1->b_data;
424 brelse(bh2); 418 brelse(bh2);
425 printk(KERN_INFO "qnx6: superblock #1 active\n"); 419 pr_info("qnx6: superblock #1 active\n");
426 } else { 420 } else {
427 /* superblock #2 active */ 421 /* superblock #2 active */
428 sbi->sb_buf = bh2; 422 sbi->sb_buf = bh2;
429 sbi->sb = (struct qnx6_super_block *)bh2->b_data; 423 sbi->sb = (struct qnx6_super_block *)bh2->b_data;
430 brelse(bh1); 424 brelse(bh1);
431 printk(KERN_INFO "qnx6: superblock #2 active\n"); 425 pr_info("qnx6: superblock #2 active\n");
432 } 426 }
433mmi_success: 427mmi_success:
434 /* sanity check - limit maximum indirect pointer levels */ 428 /* sanity check - limit maximum indirect pointer levels */
435 if (sb1->Inode.levels > QNX6_PTR_MAX_LEVELS) { 429 if (sb1->Inode.levels > QNX6_PTR_MAX_LEVELS) {
436 printk(KERN_ERR "qnx6: too many inode levels (max %i, sb %i)\n", 430 pr_err("qnx6: too many inode levels (max %i, sb %i)\n",
437 QNX6_PTR_MAX_LEVELS, sb1->Inode.levels); 431 QNX6_PTR_MAX_LEVELS, sb1->Inode.levels);
438 goto out; 432 goto out;
439 } 433 }
440 if (sb1->Longfile.levels > QNX6_PTR_MAX_LEVELS) { 434 if (sb1->Longfile.levels > QNX6_PTR_MAX_LEVELS) {
441 printk(KERN_ERR "qnx6: too many longfilename levels" 435 pr_err("qnx6: too many longfilename levels (max %i, sb %i)\n",
442 " (max %i, sb %i)\n", 436 QNX6_PTR_MAX_LEVELS, sb1->Longfile.levels);
443 QNX6_PTR_MAX_LEVELS, sb1->Longfile.levels);
444 goto out; 437 goto out;
445 } 438 }
446 s->s_op = &qnx6_sops; 439 s->s_op = &qnx6_sops;
@@ -460,7 +453,7 @@ mmi_success:
460 /* prefetch root inode */ 453 /* prefetch root inode */
461 root = qnx6_iget(s, QNX6_ROOT_INO); 454 root = qnx6_iget(s, QNX6_ROOT_INO);
462 if (IS_ERR(root)) { 455 if (IS_ERR(root)) {
463 printk(KERN_ERR "qnx6: get inode failed\n"); 456 pr_err("qnx6: get inode failed\n");
464 ret = PTR_ERR(root); 457 ret = PTR_ERR(root);
465 goto out2; 458 goto out2;
466 } 459 }
@@ -474,7 +467,7 @@ mmi_success:
474 errmsg = qnx6_checkroot(s); 467 errmsg = qnx6_checkroot(s);
475 if (errmsg != NULL) { 468 if (errmsg != NULL) {
476 if (!silent) 469 if (!silent)
477 printk(KERN_ERR "qnx6: %s\n", errmsg); 470 pr_err("qnx6: %s\n", errmsg);
478 goto out3; 471 goto out3;
479 } 472 }
480 return 0; 473 return 0;
@@ -555,8 +548,7 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino)
555 inode->i_mode = 0; 548 inode->i_mode = 0;
556 549
557 if (ino == 0) { 550 if (ino == 0) {
558 printk(KERN_ERR "qnx6: bad inode number on dev %s: %u is " 551 pr_err("qnx6: bad inode number on dev %s: %u is out of range\n",
559 "out of range\n",
560 sb->s_id, ino); 552 sb->s_id, ino);
561 iget_failed(inode); 553 iget_failed(inode);
562 return ERR_PTR(-EIO); 554 return ERR_PTR(-EIO);
@@ -566,8 +558,8 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino)
566 mapping = sbi->inodes->i_mapping; 558 mapping = sbi->inodes->i_mapping;
567 page = read_mapping_page(mapping, n, NULL); 559 page = read_mapping_page(mapping, n, NULL);
568 if (IS_ERR(page)) { 560 if (IS_ERR(page)) {
569 printk(KERN_ERR "qnx6: major problem: unable to read inode from " 561 pr_err("qnx6: major problem: unable to read inode from dev %s\n",
570 "dev %s\n", sb->s_id); 562 sb->s_id);
571 iget_failed(inode); 563 iget_failed(inode);
572 return ERR_CAST(page); 564 return ERR_CAST(page);
573 } 565 }
@@ -689,7 +681,7 @@ static int __init init_qnx6_fs(void)
689 return err; 681 return err;
690 } 682 }
691 683
692 printk(KERN_INFO "QNX6 filesystem 1.0.0 registered.\n"); 684 pr_info("QNX6 filesystem 1.0.0 registered.\n");
693 return 0; 685 return 0;
694} 686}
695 687
diff --git a/fs/qnx6/super_mmi.c b/fs/qnx6/super_mmi.c
index 29c32cba62d6..8e056b0706ef 100644
--- a/fs/qnx6/super_mmi.c
+++ b/fs/qnx6/super_mmi.c
@@ -44,15 +44,14 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent)
44 start with the first superblock */ 44 start with the first superblock */
45 bh1 = sb_bread(s, 0); 45 bh1 = sb_bread(s, 0);
46 if (!bh1) { 46 if (!bh1) {
47 printk(KERN_ERR "qnx6: Unable to read first mmi superblock\n"); 47 pr_err("qnx6: Unable to read first mmi superblock\n");
48 return NULL; 48 return NULL;
49 } 49 }
50 sb1 = (struct qnx6_mmi_super_block *)bh1->b_data; 50 sb1 = (struct qnx6_mmi_super_block *)bh1->b_data;
51 sbi = QNX6_SB(s); 51 sbi = QNX6_SB(s);
52 if (fs32_to_cpu(sbi, sb1->sb_magic) != QNX6_SUPER_MAGIC) { 52 if (fs32_to_cpu(sbi, sb1->sb_magic) != QNX6_SUPER_MAGIC) {
53 if (!silent) { 53 if (!silent) {
54 printk(KERN_ERR "qnx6: wrong signature (magic) in" 54 pr_err("qnx6: wrong signature (magic) in superblock #1.\n");
55 " superblock #1.\n");
56 goto out; 55 goto out;
57 } 56 }
58 } 57 }
@@ -60,7 +59,7 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent)
60 /* checksum check - start at byte 8 and end at byte 512 */ 59 /* checksum check - start at byte 8 and end at byte 512 */
61 if (fs32_to_cpu(sbi, sb1->sb_checksum) != 60 if (fs32_to_cpu(sbi, sb1->sb_checksum) !=
62 crc32_be(0, (char *)(bh1->b_data + 8), 504)) { 61 crc32_be(0, (char *)(bh1->b_data + 8), 504)) {
63 printk(KERN_ERR "qnx6: superblock #1 checksum error\n"); 62 pr_err("qnx6: superblock #1 checksum error\n");
64 goto out; 63 goto out;
65 } 64 }
66 65
@@ -70,7 +69,7 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent)
70 69
71 /* set new blocksize */ 70 /* set new blocksize */
72 if (!sb_set_blocksize(s, fs32_to_cpu(sbi, sb1->sb_blocksize))) { 71 if (!sb_set_blocksize(s, fs32_to_cpu(sbi, sb1->sb_blocksize))) {
73 printk(KERN_ERR "qnx6: unable to set blocksize\n"); 72 pr_err("qnx6: unable to set blocksize\n");
74 goto out; 73 goto out;
75 } 74 }
76 /* blocksize invalidates bh - pull it back in */ 75 /* blocksize invalidates bh - pull it back in */
@@ -83,27 +82,26 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent)
83 /* read second superblock */ 82 /* read second superblock */
84 bh2 = sb_bread(s, offset); 83 bh2 = sb_bread(s, offset);
85 if (!bh2) { 84 if (!bh2) {
86 printk(KERN_ERR "qnx6: unable to read the second superblock\n"); 85 pr_err("qnx6: unable to read the second superblock\n");
87 goto out; 86 goto out;
88 } 87 }
89 sb2 = (struct qnx6_mmi_super_block *)bh2->b_data; 88 sb2 = (struct qnx6_mmi_super_block *)bh2->b_data;
90 if (fs32_to_cpu(sbi, sb2->sb_magic) != QNX6_SUPER_MAGIC) { 89 if (fs32_to_cpu(sbi, sb2->sb_magic) != QNX6_SUPER_MAGIC) {
91 if (!silent) 90 if (!silent)
92 printk(KERN_ERR "qnx6: wrong signature (magic) in" 91 pr_err("qnx6: wrong signature (magic) in superblock #2.\n");
93 " superblock #2.\n");
94 goto out; 92 goto out;
95 } 93 }
96 94
97 /* checksum check - start at byte 8 and end at byte 512 */ 95 /* checksum check - start at byte 8 and end at byte 512 */
98 if (fs32_to_cpu(sbi, sb2->sb_checksum) 96 if (fs32_to_cpu(sbi, sb2->sb_checksum)
99 != crc32_be(0, (char *)(bh2->b_data + 8), 504)) { 97 != crc32_be(0, (char *)(bh2->b_data + 8), 504)) {
100 printk(KERN_ERR "qnx6: superblock #1 checksum error\n"); 98 pr_err("qnx6: superblock #1 checksum error\n");
101 goto out; 99 goto out;
102 } 100 }
103 101
104 qsb = kmalloc(sizeof(*qsb), GFP_KERNEL); 102 qsb = kmalloc(sizeof(*qsb), GFP_KERNEL);
105 if (!qsb) { 103 if (!qsb) {
106 printk(KERN_ERR "qnx6: unable to allocate memory.\n"); 104 pr_err("qnx6: unable to allocate memory.\n");
107 goto out; 105 goto out;
108 } 106 }
109 107
@@ -119,7 +117,7 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent)
119 sbi->sb_buf = bh1; 117 sbi->sb_buf = bh1;
120 sbi->sb = (struct qnx6_super_block *)bh1->b_data; 118 sbi->sb = (struct qnx6_super_block *)bh1->b_data;
121 brelse(bh2); 119 brelse(bh2);
122 printk(KERN_INFO "qnx6: superblock #1 active\n"); 120 pr_info("qnx6: superblock #1 active\n");
123 } else { 121 } else {
124 /* superblock #2 active */ 122 /* superblock #2 active */
125 qnx6_mmi_copy_sb(qsb, sb2); 123 qnx6_mmi_copy_sb(qsb, sb2);
@@ -131,7 +129,7 @@ struct qnx6_super_block *qnx6_mmi_fill_super(struct super_block *s, int silent)
131 sbi->sb_buf = bh2; 129 sbi->sb_buf = bh2;
132 sbi->sb = (struct qnx6_super_block *)bh2->b_data; 130 sbi->sb = (struct qnx6_super_block *)bh2->b_data;
133 brelse(bh1); 131 brelse(bh1);
134 printk(KERN_INFO "qnx6: superblock #2 active\n"); 132 pr_info("qnx6: superblock #2 active\n");
135 } 133 }
136 kfree(qsb); 134 kfree(qsb);
137 135