From patchwork Mon Oct 23 06:30:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10022021 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A2452601E8 for ; Mon, 23 Oct 2017 06:30:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92388285D4 for ; Mon, 23 Oct 2017 06:30:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85833286FB; Mon, 23 Oct 2017 06:30:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A3F4285D4 for ; Mon, 23 Oct 2017 06:30:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751209AbdJWGa0 (ORCPT ); Mon, 23 Oct 2017 02:30:26 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:41644 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083AbdJWGa0 (ORCPT ); Mon, 23 Oct 2017 02:30:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=m5SxHOtpX/tUGASpobqsgyii5oTNCpaaE2tZ1m2bmmI=; b=n8bjgJnAtjJxXdBS99gXnwH/6 LUmSTk+p6VrOl9FygTTP5gwRSILwCt5NMvhLWvVi9jNVqtrCIEbu+kf1dHITZRYaEiQeubE5Np7FP FPPDuYPm2YScpKP4On6x6qR72Gn3w+RwsxIUPv501FHgGE0dPUZtlP5folzn9/Q04smIdCp+NgP+H ALtFP1OigzPcCoStjead5BLys2yxnu3Sqsl8q/gP3SKlVjA6Ptb52nNzcYrgi6KaYWjrTKg+nX3iX SkH8e7CDX0hALpXtd5BsURMPPYYSxTs5/mEYaH2msNyozaW+eNTwe65geVljjfFBgt6DHIk5Ie/ta QTOr7ZUiA==; Received: from [46.125.250.114] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1e6WFl-0002mR-5H for linux-xfs@vger.kernel.org; Mon, 23 Oct 2017 06:30:25 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Subject: [PATCH 1/4] xfs: add asserts for the mmap lock in xfs_{insert, collapse}_file_space Date: Mon, 23 Oct 2017 08:30:14 +0200 Message-Id: <20171023063017.11520-2-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023063017.11520-1-hch@lst.de> References: <20171023063017.11520-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- 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 034f3429ca8c..170b74c7f2d5 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -1334,6 +1334,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); @@ -1408,6 +1410,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);