summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-14 16:04:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-14 16:04:26 -0700
commit78d5dcda92a17f17132671c269ea2c3a17688649 (patch)
tree8b3fa4f89eb2c488b080663d88d10de413239f39
parent2cfde72f0f26d3df7e565c5dce687c372042feba (diff)
parent7d2ac45611b072a24e5014a56a65e6be31c1f884 (diff)
downloadlinux-78d5dcda92a17f17132671c269ea2c3a17688649.tar.bz2
Merge tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy
Pull jfs update from David Kleikamp: "Not much this time. Just a one-liner format fix" * tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy: jfs: %pf is only for function pointers
-rw-r--r--fs/jfs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 5d30c56ae075..4cd9798f4948 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -102,7 +102,7 @@ void jfs_error(struct super_block *sb, const char *fmt, ...)
vaf.fmt = fmt;
vaf.va = &args;
- pr_err("ERROR: (device %s): %pf: %pV\n",
+ pr_err("ERROR: (device %s): %ps: %pV\n",
sb->s_id, __builtin_return_address(0), &vaf);
va_end(args);