Merge branch 'for-4.10/fs-unmap' of git://git.kernel.dk/linux-block

Pull fs meta data unmap optimization from Jens Axboe:
 "A series from Jan Kara, providing a more efficient way for unmapping
  meta data from in the buffer cache than doing it block-by-block.

  Provide a general helper that existing callers can use"

* 'for-4.10/fs-unmap' of git://git.kernel.dk/linux-block:
  fs: Remove unmap_underlying_metadata
  fs: Add helper to clean bdev aliases under a bh and use it
  ext2: Use clean_bdev_aliases() instead of iteration
  ext4: Use clean_bdev_aliases() instead of iteration
  direct-io: Use clean_bdev_aliases() instead of handmade iteration
  fs: Provide function to unmap metadata for a range of blocks

diff --cc fs/buffer.c
Simple merge

diff --cc fs/direct-io.c
Simple merge

diff --cc fs/ext2/inode.c
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/page-io.c
Simple merge

diff --cc fs/ocfs2/aops.c
Simple merge