diff options
| author | Dan Williams | 2018-06-09 00:16:40 +0200 |
|---|---|---|
| committer | Dan Williams | 2018-06-09 00:16:40 +0200 |
| commit | b56845794e1e93121acb74ca325db965035d5545 (patch) | |
| tree | 3435f4e8de92d5a63fdc15953391cf057ee46642 /fs/xfs/xfs_ioctl.c | |
| parent | dax: Use dax_write_cache* helpers (diff) | |
| parent | dax: dax_insert_mapping_entry always succeeds (diff) | |
| download | kernel-qcow2-linux-b56845794e1e93121acb74ca325db965035d5545.tar.gz kernel-qcow2-linux-b56845794e1e93121acb74ca325db965035d5545.tar.xz kernel-qcow2-linux-b56845794e1e93121acb74ca325db965035d5545.zip | |
Merge branch 'for-4.18/dax' into libnvdimm-for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 89fb1eb80aae..91e73d663099 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -39,7 +39,6 @@ #include "xfs_icache.h" #include "xfs_symlink.h" #include "xfs_trans.h" -#include "xfs_pnfs.h" #include "xfs_acl.h" #include "xfs_btree.h" #include <linux/fsmap.h> @@ -614,7 +613,7 @@ xfs_ioc_space( struct xfs_inode *ip = XFS_I(inode); struct iattr iattr; enum xfs_prealloc_flags flags = 0; - uint iolock = XFS_IOLOCK_EXCL; + uint iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL; int error; /* @@ -644,13 +643,10 @@ xfs_ioc_space( return error; xfs_ilock(ip, iolock); - error = xfs_break_layouts(inode, &iolock); + error = xfs_break_layouts(inode, &iolock, BREAK_UNMAP); if (error) goto out_unlock; - xfs_ilock(ip, XFS_MMAPLOCK_EXCL); - iolock |= XFS_MMAPLOCK_EXCL; - switch (bf->l_whence) { case 0: /*SEEK_SET*/ break; |