Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / fs / jfs / jfs_metapage.c

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 9e3aaff11f89cf9d67e2e1289fb1f47003c584c9..d165cde0c68dda885c2f5bb512f48465f521c4a1 100644 (file)
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -647,7 +647,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
        if (mp) {
                if (mp->logical_size != size) {
                        jfs_error(inode->i_sb,
-                                 "__get_metapage: mp->logical_size != size");
+                                 "get_mp->logical_size != size\n");
                        jfs_err("logical_size = %d, size = %d",
                                mp->logical_size, size);
                        dump_stack();
@@ -658,8 +658,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
                if (test_bit(META_discard, &mp->flag)) {
                        if (!new) {
                                jfs_error(inode->i_sb,
-                                         "__get_metapage: using a "
-                                         "discarded metapage");
+                                         "using a discarded metapage\n");
                                discard_metapage(mp);
                                goto unlock;
                        }