Merge branch 'iomap-4.19-merge' into linux-gfs2/for-next

Browse source

Merge xfs branch 'iomap-4.19-merge' into linux-gfs2/for-next.  This
brings in readpage and direct I/O support for inline data.

The IOMAP_F_BUFFER_HEAD flag introduced in commit "iomap: add initial
support for writes without buffer heads" needs to be set for gfs2 as
well, so do that in the merge.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

...

This commit is contained in:

Andreas Gruenbacher 2018-07-25 00:06:59 +02:00

parent c25892827c 806a1477b1

commit 0ed91eca11

4 changed files with 420 additions and 47 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

fs/gfs2/bmap.c

View file

452

fs/iomap.c

View file

6

fs/xfs/xfs_iomap.c

View file

5

include/linux/iomap.h

View file