diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-11-29 11:21:58 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-12-04 17:58:53 +0100 |
| commit | 952da06375c8f3aa58474fff718d9ae8442531b9 (patch) | |
| tree | 8fce857c95365fd0340d4975d7bf83bc071e6761 /fs/ext4 | |
| parent | xfs: pass the mapping flags to xfs_bmbt_to_iomap (diff) | |
| download | linux-952da06375c8f3aa58474fff718d9ae8442531b9.tar.xz linux-952da06375c8f3aa58474fff718d9ae8442531b9.zip | |
iomap: add a IOMAP_DAX flag
Add a flag so that the file system can easily detect DAX operations
based just on the iomap operation requested instead of looking at
inode state using IS_DAX. This will be needed to apply the to be
added partition offset only for operations that actually use DAX,
but not things like fiemap that are based on the block device.
In the long run it should also allow turning the bdev, dax_dev
and inline_data into a union.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20211129102203.2243509-25-hch@lst.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d316a2009489..89c4a174bd39 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3349,8 +3349,8 @@ retry: * DAX and direct I/O are the only two operations that are currently * supported with IOMAP_WRITE. */ - WARN_ON(!IS_DAX(inode) && !(flags & IOMAP_DIRECT)); - if (IS_DAX(inode)) + WARN_ON(!(flags & (IOMAP_DAX | IOMAP_DIRECT))); + if (flags & IOMAP_DAX) m_flags = EXT4_GET_BLOCKS_CREATE_ZERO; /* * We use i_size instead of i_disksize here because delalloc writeback |