summaryrefslogtreecommitdiffstats
path: root/fs/jfs/jfs_metapage.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-11 10:19:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-11 10:19:34 -0700
commit9db019278cad416681e27b15203d4c5e939c315b (patch)
treee0c7e440af4444176a34320e18df8d623201dad5 /fs/jfs/jfs_metapage.c
parent0ff08ba5d066619f9973bfcdb5a21320d54219d0 (diff)
parenteb8630d7d2fd13589e6a7a3ae2fe1f75f867fbed (diff)
downloadlinux-stable-9db019278cad416681e27b15203d4c5e939c315b.tar.gz
linux-stable-9db019278cad416681e27b15203d4c5e939c315b.tar.bz2
linux-stable-9db019278cad416681e27b15203d4c5e939c315b.zip
Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy
Pull jfs update from Dave Kleikamp: "A couple cleanups to JFS for 3.11" * tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy: jfs: Update jfs_error jfs: fix sparse warning in fs/jfs/xattr.c
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 9e3aaff11f89..d165cde0c68d 100644
--- 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;
}