diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-07-12 07:24:40 +0200 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2018-07-12 07:24:40 +0200 |
| commit | c2efdfc100af42cc04525ef0db74b176da59e1a4 (patch) | |
| tree | 18dd5e3e42762b00d66c2c86b91ad08c91063b96 /fs/xfs | |
| parent | Linux 4.18-rc4 (diff) | |
| parent | iomap: add inline data support to iomap_readpage_actor (diff) | |
| download | linux-c2efdfc100af42cc04525ef0db74b176da59e1a4.tar.xz linux-c2efdfc100af42cc04525ef0db74b176da59e1a4.zip | |
Merge branch 'iomap-4.19-merge' into xfs-4.19-merge
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 55876dd02f0c..e08a84d9ee72 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -626,7 +626,7 @@ retry: * Flag newly allocated delalloc blocks with IOMAP_F_NEW so we punch * them out if the write happens to fail. */ - iomap->flags = IOMAP_F_NEW; + iomap->flags |= IOMAP_F_NEW; trace_xfs_iomap_alloc(ip, offset, count, 0, &got); done: if (isnullstartblock(got.br_startblock)) @@ -1032,6 +1032,8 @@ xfs_file_iomap_begin( if (XFS_FORCED_SHUTDOWN(mp)) return -EIO; + iomap->flags |= IOMAP_F_BUFFER_HEAD; + if (((flags & (IOMAP_WRITE | IOMAP_DIRECT)) == IOMAP_WRITE) && !IS_DAX(inode) && !xfs_get_extsz_hint(ip)) { /* Reserve delalloc blocks for regular writeback. */ @@ -1132,7 +1134,7 @@ xfs_file_iomap_begin( if (error) return error; - iomap->flags = IOMAP_F_NEW; + iomap->flags |= IOMAP_F_NEW; trace_xfs_iomap_alloc(ip, offset, length, 0, &imap); out_finish: |