diff options
| author | Dave Chinner <[email protected]> | 2015-02-23 23:27:47 +0000 |
|---|---|---|
| committer | Dave Chinner <[email protected]> | 2015-02-23 23:27:47 +0000 |
| commit | 88e8fda99a4c99a1a6482510655dbd88cccd221b (patch) | |
| tree | b5f10ecc7c99ebf3eeb7a6733c15d3930b5f8a63 /fs/xfs/xfs_ioctl.c | |
| parent | Merge branch 'xfs-generic-sb-counters' into for-next (diff) | |
| parent | xfs: lock out page faults from extent swap operations (diff) | |
| download | kernel-88e8fda99a4c99a1a6482510655dbd88cccd221b.tar.gz kernel-88e8fda99a4c99a1a6482510655dbd88cccd221b.zip | |
Merge branch 'xfs-mmap-lock' into for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index ac4feae45eb3..4ee44ddfdfb7 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -631,7 +631,7 @@ xfs_ioc_space( if (filp->f_flags & O_DSYNC) flags |= XFS_PREALLOC_SYNC; - if (ioflags & XFS_IO_INVIS) + if (ioflags & XFS_IO_INVIS) flags |= XFS_PREALLOC_INVISIBLE; error = mnt_want_write_file(filp); @@ -643,6 +643,9 @@ xfs_ioc_space( if (error) goto out_unlock; + xfs_ilock(ip, XFS_MMAPLOCK_EXCL); + iolock |= XFS_MMAPLOCK_EXCL; + switch (bf->l_whence) { case 0: /*SEEK_SET*/ break; |