diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-11-28 19:34:03 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-11-28 19:34:03 -0500 |
| commit | 1ec28f8b8ada4e4f77d1af006a3a474f4f83b8e3 (patch) | |
| tree | 2e810e02a66cdec0bc82a8555796b7083ad03416 /fs/xfs/xfs_bmap_util.h | |
| parent | 61647c77cb15354a329cbb36fe7a2253b36b51b1 (diff) | |
| parent | 2e6e902d185027f8e3cb8b7305238f7e35d6a436 (diff) | |
Merge v4.20-rc4 into drm-next
Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_bmap_util.h')
| -rw-r--r-- | fs/xfs/xfs_bmap_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/xfs/xfs_bmap_util.h b/fs/xfs/xfs_bmap_util.h index 87363d136bb6..7a78229cf1a7 100644 --- a/fs/xfs/xfs_bmap_util.h +++ b/fs/xfs/xfs_bmap_util.h | |||
| @@ -80,4 +80,7 @@ int xfs_bmap_count_blocks(struct xfs_trans *tp, struct xfs_inode *ip, | |||
| 80 | int whichfork, xfs_extnum_t *nextents, | 80 | int whichfork, xfs_extnum_t *nextents, |
| 81 | xfs_filblks_t *count); | 81 | xfs_filblks_t *count); |
| 82 | 82 | ||
| 83 | int xfs_flush_unmap_range(struct xfs_inode *ip, xfs_off_t offset, | ||
| 84 | xfs_off_t len); | ||
| 85 | |||
| 83 | #endif /* __XFS_BMAP_UTIL_H__ */ | 86 | #endif /* __XFS_BMAP_UTIL_H__ */ |