| Message ID | 20190809225833.6657-9-ira.weiny@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | RDMA/FS DAX truncate proposal V1,000,002 ;-) | expand |
On Fri, Aug 09, 2019 at 03:58:22PM -0700, ira.weiny@intel.com wrote: > From: Ira Weiny <ira.weiny@intel.com> > > 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@intel.com> > --- > 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, That looks wrong. If you require xfs_break_lease_layouts() outside of pnfs context, then move the function in the XFS code base to a file that is built in. It's only external dependency is on the break_layout() function, and XFS already has other unconditional direct calls to break_layout()... Cheers, Dave.
On Sat, Aug 10, 2019 at 09:22:09AM +1000, Dave Chinner wrote: > On Fri, Aug 09, 2019 at 03:58:22PM -0700, ira.weiny@intel.com wrote: > > From: Ira Weiny <ira.weiny@intel.com> > > > > 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@intel.com> > > --- > > 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, > > That looks wrong. It may be... > > If you require xfs_break_lease_layouts() outside > of pnfs context, then move the function in the XFS code base to a > file that is built in. It's only external dependency is on the > break_layout() function, and XFS already has other unconditional > direct calls to break_layout()... I'll check. This patch was part of the original series and I must admit I don't remember why I did it this way... Thanks, Ira > > Cheers, > > Dave. > -- > Dave Chinner > david@fromorbit.com
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;