diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-05-06 15:22:34 -0400 |
|---|---|---|
| committer | Eric Sandeen <sandeen@sandeen.net> | 2022-05-06 15:22:34 -0400 |
| commit | 8b4c5cd1883f3aa9c8de44ac10ff408a429b718b (patch) | |
| tree | 1cb1c5762af7bb33422a69dc3a72249a4e924b54 | |
| parent | afe6c94368623c45fad236d43b74f3df36b8159c (diff) | |
| download | xfsprogs-dev-8b4c5cd1883f3aa9c8de44ac10ff408a429b718b.tar.gz | |
xfs: pass the mapping flags to xfs_bmbt_to_iomap
Source kernel commit: 740fd671e04f8a977018eb9cfe440b4817850f0d
To prepare for looking at the IOMAP_DAX flag in xfs_bmbt_to_iomap pass in
the input mapping flags to xfs_bmbt_to_iomap.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20211129102203.2243509-24-hch@lst.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | libxfs/libxfs_priv.h | 4 | ||||
| -rw-r--r-- | libxfs/xfs_bmap.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index d4fec73557..12028efbf8 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -66,8 +66,8 @@ extern struct kmem_cache *xfs_inode_cache; extern struct kmem_cache *xfs_trans_cache; /* fake up iomap, (not) used in xfs_bmap.[ch] */ -#define IOMAP_F_SHARED 0x04 -#define xfs_bmbt_to_iomap(a, b, c, d) ((void) 0) +#define IOMAP_F_SHARED 0x04 +#define xfs_bmbt_to_iomap(a, b, c, d, e) ((void) 0) /* CRC stuff, buffer API dependent on it */ #define crc32c(c,p,l) crc32c_le((c),(unsigned char const *)(p),(l)) diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 8906265a7d..3d34b886a3 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -4544,7 +4544,7 @@ xfs_bmapi_convert_delalloc( * the extent. Just return the real extent at this offset. */ if (!isnullstartblock(bma.got.br_startblock)) { - xfs_bmbt_to_iomap(ip, iomap, &bma.got, flags); + xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags); *seq = READ_ONCE(ifp->if_seq); goto out_trans_cancel; } @@ -4591,7 +4591,7 @@ xfs_bmapi_convert_delalloc( XFS_STATS_INC(mp, xs_xstrat_quick); ASSERT(!isnullstartblock(bma.got.br_startblock)); - xfs_bmbt_to_iomap(ip, iomap, &bma.got, flags); + xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags); *seq = READ_ONCE(ifp->if_seq); if (whichfork == XFS_COW_FORK) |