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

diff --cc fs/jfs/jfs_dtree.c
Simple merge

diff --cc fs/jfs/jfs_metapage.c
Simple merge

diff --cc fs/jfs/namei.c
Simple merge