aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jfs/jfs_metapage.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-06-04 19:39:15 -0400
committerDave Kleikamp <dave.kleikamp@oracle.com>2013-06-05 15:47:19 -0400
commiteb8630d7d2fd13589e6a7a3ae2fe1f75f867fbed (patch)
tree16a5040af9b8df061385de9e0ab8e13e51790ddf /fs/jfs/jfs_metapage.c
parent21d1101f013c12d1dd78cfdf263d619c80975b47 (diff)
jfs: Update jfs_error
Use a more current logging style. Add __printf format and argument verification. Remove embedded function names from formats. Add %pf, __builtin_return_address(0) to jfs_error. Add newlines to formats for kernel style consistency. (One format already had an erroneous newline) Coalesce formats and align arguments. Object size reduced ~1KiB. $ size fs/jfs/built-in.o* text data bss dec hex filename 201891 35488 63936 301315 49903 fs/jfs/built-in.o.new 202821 35488 64192 302501 49da5 fs/jfs/built-in.o.old Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Diffstat (limited to 'fs/jfs/jfs_metapage.c')
-rw-r--r--fs/jfs/jfs_metapage.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 6740d34cd82b..6052c0d39382 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -646,7 +646,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
646 if (mp) { 646 if (mp) {
647 if (mp->logical_size != size) { 647 if (mp->logical_size != size) {
648 jfs_error(inode->i_sb, 648 jfs_error(inode->i_sb,
649 "__get_metapage: mp->logical_size != size"); 649 "get_mp->logical_size != size\n");
650 jfs_err("logical_size = %d, size = %d", 650 jfs_err("logical_size = %d, size = %d",
651 mp->logical_size, size); 651 mp->logical_size, size);
652 dump_stack(); 652 dump_stack();
@@ -657,8 +657,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
657 if (test_bit(META_discard, &mp->flag)) { 657 if (test_bit(META_discard, &mp->flag)) {
658 if (!new) { 658 if (!new) {
659 jfs_error(inode->i_sb, 659 jfs_error(inode->i_sb,
660 "__get_metapage: using a " 660 "using a discarded metapage\n");
661 "discarded metapage");
662 discard_metapage(mp); 661 discard_metapage(mp);
663 goto unlock; 662 goto unlock;
664 } 663 }