From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Oct 2016 20:45:09 +0000 (-0700)
Subject: Merge tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.9-rc1~134
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=2105b9ff733c5e5ab3e0481f1c953ac3f7d7c44a;p=karo-tx-linux.git

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
---

2105b9ff733c5e5ab3e0481f1c953ac3f7d7c44a