This is an effort to use iomap for direct I/O in btrfs. This would change the call from __blockdev_direct_io() to iomap_dio_rw(). These are remanants of the series which was revoked due to page invalidation errors and adds patches in iomap for proper buffered fallback. The main objective is to lose the buffer head and use bio defined by iomap code, and to use more of generic-FS codebase. These patches are based and tested on vanilla. I have tested it against xfstests. The tree is available at https://github.com/goldwynr/linux/tree/btrfs-iomap-dio Changes since v1 - Incorporated back the efficiency change for inode locking - Review comments about coding style and git comments - Merge related patches into one - Direct read to go through btrfs_direct_IO() - Removal of no longer used function dio_end_io() Changes since v2 - aligning iomap offset/length to the position/length of I/O - Removed btrfs_dio_data - Removed BTRFS_INODE_READDIO_NEED_LOCK - Re-incorporating write efficiency changes caused lockdep_assert() in iomap to be triggered, remove that code. Changes since v3 - Fixed freeze on generic/095. Use iomap_end() to account for failed/incomplete dio instead of btrfs_dio_data Changes since v4 - moved lockdep_assert_held() to functions calling iomap_dio_rw() This may be called immidiately after calling inode lock and may feel not required, but it seems important. - Removed comments which are no longer required - Changed commit comments to make them more appropriate Changes since v5 - restore inode_dio_wait() in truncate - Removed lockdep_assert_held() near callers Changes since v6 - Fixed hangs due to underlying device failures - Removed the patch to wait while releasing pages Changes since v7 - Moved reservation into btrfs iomap begin()/end() for correct reservation cleanup in case of device error. - Merged patches switch to iomap, and adding btrfs_iomap_end() for easier bisection. The switch to iomap would fail in case of dio after buffered writes. Changes since v8 - Added a flag to iomap_dio_rw() to return zero for buffered fallback Changes since v9 - flag name changes for iomap_dio_rw() Changes since v10 - flag datatype changed to unsigned int fs/btrfs/Kconfig | 1 fs/btrfs/btrfs_inode.h | 18 -- fs/btrfs/ctree.h | 5 fs/btrfs/file.c | 116 ++++++++++++-- fs/btrfs/inode.c | 402 ++++++++++++++++++------------------------------- fs/direct-io.c | 19 -- fs/ext4/file.c | 11 + fs/gfs2/file.c | 14 + fs/iomap/direct-io.c | 11 + fs/xfs/xfs_file.c | 15 + fs/zonefs/super.c | 16 + include/linux/fs.h | 2 include/linux/iomap.h | 25 ++- 13 files changed, 335 insertions(+), 320 deletions(-) -- Goldwyn
