]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-5.8-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jun 2020 16:47:25 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Jun 2020 16:47:25 +0000 (09:47 -0700)
commit78a28f384622924ba3178d3a5437fdbcdf11d870
tree07278a516561c15bac191b221f5fb27353083f8c
parenta6ec2fb0729fa4bafb015599738599a38caae408
parentd0b8f8aa7ceb4ce4e512be6b5ee1a1f9438d38fb
Merge tag 'for-5.8-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs updates from David Sterba:
 "This reverts the direct io port to iomap infrastructure of btrfs
  merged in the first pull request. We found problems in invalidate page
  that don't seem to be fixable as regressions or without changing iomap
  code that would not affect other filesystems.

  There are four reverts in total, but three of them are followup
  cleanups needed to revert 6e1fb14e86fe cleanly. The result is the
  buffer head based implementation of direct io.

  Reverts are not great, but under current circumstances I don't see
  better options"

* tag 'for-5.8-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Revert "btrfs: switch to iomap_dio_rw() for dio"
  Revert "fs: remove dio_end_io()"
  Revert "btrfs: remove BTRFS_INODE_READDIO_NEED_LOCK"
  Revert "btrfs: split btrfs_direct_IO to read and write part"
fs/btrfs/inode.c
fs/direct-io.c
include/linux/fs.h