Skip to content

Commit

Permalink
Merge tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy
Browse files Browse the repository at this point in the history
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
  • Loading branch information
torvalds committed Apr 14, 2015
2 parents 2cfde72 + 7d2ac45 commit 78d5dcd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/jfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 78d5dcd

Please sign in to comment.