Merge tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2016 20:45:09 +0000 (13:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2016 20:45:09 +0000 (13:45 -0700)
commit2105b9ff733c5e5ab3e0481f1c953ac3f7d7c44a
tree1a03fef18bfd416c942d82811ebb098c64f8afd8
parent5fdf4939dc66307daf30a3d5355a2bfb9d207676
parent240c5185c52d00725ae7da7d1ee82ad8b8306d52
Merge tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy

Pull jfs updates from David Kleikamp:
 "Minor jfs updates"

* tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy:
  jfs: Simplify code
  jfs: jump to error_out when filemap_{fdatawait, write_and_wait} fails