diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 16:04:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 16:04:26 -0700 |
| commit | 78d5dcda92a17f17132671c269ea2c3a17688649 (patch) | |
| tree | 8b3fa4f89eb2c488b080663d88d10de413239f39 /fs | |
| parent | Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (diff) | |
| parent | jfs: %pf is only for function pointers (diff) | |
| download | linux-dev-78d5dcda92a17f17132671c269ea2c3a17688649.tar.xz linux-dev-78d5dcda92a17f17132671c269ea2c3a17688649.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jfs/super.c | 2 |
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); |