From 783dd78da0b7e12df053900cfaf6ccee90b6421d Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 23 Oct 2017 16:32:38 -0700
Subject: [PATCH 44/77] xfs: add asserts for the mmap lock in
xfs_{insert,collapse}_file_space
Git-commit: 9ad1a23afb6c561acfa62850934ddc6c70c35994
Patch-mainline: v4.15-rc1
References: bsc#1095344
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Nikolay Borisov <nborisov@suse.com>
---
fs/xfs/xfs_bmap_util.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 09e21f704444..3709cccc79cd 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1315,6 +1315,8 @@ xfs_collapse_file_space(
bool done = false;
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
+ ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));
+
trace_xfs_collapse_file_space(ip);
error = xfs_free_file_space(ip, offset, len);
@@ -1389,6 +1391,8 @@ xfs_insert_file_space(
bool done = false;
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
+ ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));
+
trace_xfs_insert_file_space(ip);
error = xfs_prepare_shift(ip, offset);
--
2.7.4