From: Ira Weiny <ira.weiny@xxxxxxxxx>
If pages are under a lease fail the truncate operation. We change the order of
lease breaks to directly fail the operation if the lease exists.
Select EXPORT_BLOCK_OPS for FS_DAX to ensure that xfs_break_lease_layouts() is
defined for FS_DAX as well as pNFS.
Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx>
---
fs/Kconfig | 1 +
fs/xfs/xfs_file.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/Kconfig b/fs/Kconfig
index 14cd4abdc143..c10b91f92528 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -48,6 +48,7 @@ config FS_DAX
select DEV_PAGEMAP_OPS if (ZONE_DEVICE && !FS_DAX_LIMITED)
select FS_IOMAP
select DAX
+ select EXPORTFS_BLOCK_OPS
help
Direct Access (DAX) can be used on memory-backed block devices.
If the block device supports DAX and the filesystem supports DAX,
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 447571e3cb02..850d0a0953a2 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -773,10 +773,11 @@ xfs_break_layouts(
retry = false;
switch (reason) {
case BREAK_UNMAP:
- error = xfs_break_dax_layouts(inode, &retry, off, len);
+ error = xfs_break_leased_layouts(inode, iolock, &retry);
if (error || retry)
break;
- /* fall through */
+ error = xfs_break_dax_layouts(inode, &retry, off, len);
+ break;
case BREAK_WRITE:
error = xfs_break_leased_layouts(inode, iolock, &retry);
break;
--
2.20.1
