diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2018-07-25 00:06:59 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2018-07-25 00:08:20 +0200 |
| commit | 0ed91eca1130e6c0fe66e01fa6ea92965e81900c (patch) | |
| tree | 62c03dedbdceb8d9105c7e29490e777c4037b398 /fs/gfs2 | |
| parent | c25892827c7996eb19ca2a5b1cf596218122e994 (diff) | |
| parent | 806a1477b10a153cd01ee7ccba8ca2492df3e0b2 (diff) | |
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>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/bmap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 49a6ab919bd7..89f1f7d3186d 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -890,7 +890,7 @@ unstuff: iomap->addr = be64_to_cpu(*ptr) << inode->i_blkbits; iomap->length = len << inode->i_blkbits; iomap->type = IOMAP_MAPPED; - iomap->flags = IOMAP_F_MERGED; + iomap->flags |= IOMAP_F_MERGED; if (eob) iomap->flags |= IOMAP_F_GFS2_BOUNDARY; @@ -1084,6 +1084,8 @@ static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length, struct metapath mp = { .mp_aheight = 1, }; int ret; + iomap->flags |= IOMAP_F_BUFFER_HEAD; + trace_gfs2_iomap_start(ip, pos, length, flags); if ((flags & IOMAP_WRITE) && !(flags & IOMAP_DIRECT)) { ret = gfs2_iomap_begin_write(inode, pos, length, flags, iomap); |