Commit 78d5dcda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2cfde72f 7d2ac456

fs/jfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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);