Merge branch 'iomap-4.19-merge' into linux-gfs2/for-next
authorAndreas Gruenbacher <agruenba@redhat.com>
Tue, 24 Jul 2018 22:06:59 +0000 (00:06 +0200)
committerAndreas Gruenbacher <agruenba@redhat.com>
Tue, 24 Jul 2018 22:08:20 +0000 (00:08 +0200)
commit0ed91eca1130e6c0fe66e01fa6ea92965e81900c
tree62c03dedbdceb8d9105c7e29490e777c4037b398
parentc25892827c7996eb19ca2a5b1cf596218122e994
parent806a1477b10a153cd01ee7ccba8ca2492df3e0b2
Merge branch 'iomap-4.19-merge' into linux-gfs2/for-next

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>
fs/gfs2/bmap.c