From patchwork Wed May 30 10:00:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438219 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 4326B602CC for ; Wed, 30 May 2018 10:00:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32A80288B7 for ; Wed, 30 May 2018 10:00:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27613288ED; Wed, 30 May 2018 10:00:54 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EA7E288B7 for ; Wed, 30 May 2018 10:00:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEE6B6B027D; Wed, 30 May 2018 06:00:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D9D106B027E; Wed, 30 May 2018 06:00:44 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB5B46B027F; Wed, 30 May 2018 06:00:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 861646B027D for ; Wed, 30 May 2018 06:00:44 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id b31-v6so11089341plb.5 for ; Wed, 30 May 2018 03:00:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=i7JT933ibTUEcpWy1i8Zm+z4ijjji7Gy7KVYcgIX/j0=; b=m1tDudX/f/UpQNIodLHKrzhgv5re9KequV6iiYdMf9eBrQoyMfGaW5fqnLyDf6bA8G UXXJ5q48VV1fvzbpm5Ag07nxedf3J37XwLSev7qoJEfWJ7q1dqrGxMFl7n7yXcKev3GM /lkNy85IEGRWWMDE5SrhbhUBK6YnwcdWhrctts+LhSsXksy0YTUVdz+FNUJB0LKJWeWP LRI11b5yImYvjNGJiHstycFO6B82fUuT5Z8DRU8nM9mZb1c2CNHi4v7bIPgdxnkiu5yR LkmYrb4mGGAEeMhSnvqZ0tSNPGyl4kRXbXKM0z/aWw5zeHVoLdtawyZ/0ffdF9J9z5Uc 2Oxg== X-Gm-Message-State: ALKqPwdbBdwiOwAQzxaF/69QdHSD2Zwz3lKmMyWjDPJw4h04uPJ2wfWJ qF3jq315UBW6Lc+nIXisga6Q7E78SKazzBUHZr+l5MvTttTNWJuWMMmgYrblsrjcPTVYLUgiusE 0703QID+NKSgyLAXiH+5z6nkgQZ2T2xp3nD27X2TjnC22m8jKWEccCNqnhm/LKp0= X-Received: by 2002:a63:6f05:: with SMTP id k5-v6mr1739863pgc.62.1527674444244; Wed, 30 May 2018 03:00:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ77cyeSOmGbkIKJ04TwAObAldWQFJbldqaJbU4euvvO0PPwq8CVEWqQid/X8fTB4KURJcm X-Received: by 2002:a63:6f05:: with SMTP id k5-v6mr1739811pgc.62.1527674443455; Wed, 30 May 2018 03:00:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674443; cv=none; d=google.com; s=arc-20160816; b=VDid5QybC+eWV/PhKJmBx7b84OKm0MrsTtkbFCRwlon8rcgn/LBcpENw02fbMGKLCj gMRcocgjNQyLnyMIsIX0WNkW5UKhZM4I59GMDF9QRP1ol1y1r2gRGadJ7mfSwnIUuK3y pkRysiKIn0fmGWcaD6FAg2CHx/rpeVRBiXlc0q8k6xFjFEbeBLOJQcQwKT90WKtMacJ5 HtPQaAOC6FIg94LLZwP4c9RwghOd59xJWRXa00Js3Ql8OBsdN/plOIFTKxp2ARsU5v/4 /e1kHD2GZX/xZBbjFsIIOXvxv3XoZvhSHKXVxqWFayBR+/1Sv0TxSg76IHWSMO4bTX5t ShlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=i7JT933ibTUEcpWy1i8Zm+z4ijjji7Gy7KVYcgIX/j0=; b=Afz2LYzx7SIQBudVcpOLBmYJzijx9QeClGXaUokWUc6O13VpL5qJ5GUwTB0qJ+y6gq s6mQDNZhEFe1mGNV87BO5Rl5zvLm6wp7JZ6VFyp2mH9WYUIBW++bGs8RiSDuhNq2pmpR /Lbu/q8bqzuYoruBGXbM1eTWNYFkhh7VnveLBYXWNY711l9kXOinZ4bXmGcDURCUwXNV QA39roYAqbVTS2xpz7ISE+zzCKaWnhWyo47hR8Iw4ajj8zgwJs9fcIYJt4NrNh1LOFPN /0Te0xxVH+Ty6YCHAQiyUk5T916CxU/mYm+sYXRmQYCpvbD0n7icG+68ZavkiiOyRHK+ ryIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=oGiJglnO; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id u2-v6si12692928plr.598.2018.05.30.03.00.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 03:00:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=oGiJglnO; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org 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:Cc:To:From:Sender:Reply-To: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=i7JT933ibTUEcpWy1i8Zm+z4ijjji7Gy7KVYcgIX/j0=; b=oGiJglnO5a3Im4sBC/RQx8Onl NePecoeU2MPl5oebKC1J7AVx/X41bkYDHS4zRzSsCtXQ3SD5TDSk7+ynvsO2UgykLJmZNAFqfqQEn fzhFg3AoLxJ9hW3H46PdTHEr2XQrbR24BkWb33rN65LbmMhsJPyhJO6YO+/XXhVQPUAu3jesEBASb GCzwC9sgRAXZQP/PyhIcdtXbuH/akQG/p+9PCNLnJCR7GobM/5LXoT4dHRmoRxPVff8pvYT5hXouh lLh69aW+i0WkHeMW2tDOJBmVMg26r8EfdnWXgQNq4/jxBa2AAIX8SCP7bkColNywKctznzW2UI6LC y/vGdUzoQ==; Received: from 213-225-38-123.nat.highway.a1.net ([213.225.38.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNxuH-0008Gb-Jw; Wed, 30 May 2018 10:00:38 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 05/18] xfs: move locking into xfs_bmap_punch_delalloc_range Date: Wed, 30 May 2018 12:00:00 +0200 Message-Id: <20180530100013.31358-6-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530100013.31358-1-hch@lst.de> References: <20180530100013.31358-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Both callers want the same looking, so do it only once. Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster --- fs/xfs/xfs_aops.c | 2 -- fs/xfs/xfs_bmap_util.c | 7 ++++--- fs/xfs/xfs_iomap.c | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index f2333e351e07..5dd09e83c81c 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -761,10 +761,8 @@ xfs_aops_discard_page( "page discard on page "PTR_FMT", inode 0x%llx, offset %llu.", page, ip->i_ino, offset); - xfs_ilock(ip, XFS_ILOCK_EXCL); error = xfs_bmap_punch_delalloc_range(ip, start_fsb, PAGE_SIZE / i_blocksize(inode)); - xfs_iunlock(ip, XFS_ILOCK_EXCL); if (error && !XFS_FORCED_SHUTDOWN(mp)) xfs_alert(mp, "page discard unable to remove delalloc mapping."); out_invalidate: diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index f2b87873612d..86a7ee425bfc 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -712,12 +712,11 @@ xfs_bmap_punch_delalloc_range( struct xfs_iext_cursor icur; int error = 0; - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - + xfs_ilock(ip, XFS_ILOCK_EXCL); if (!(ifp->if_flags & XFS_IFEXTENTS)) { error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK); if (error) - return error; + goto out_unlock; } if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got)) @@ -738,6 +737,8 @@ xfs_bmap_punch_delalloc_range( } } +out_unlock: + xfs_iunlock(ip, XFS_ILOCK_EXCL); return error; } diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index da6d1995e460..f949f0dd7382 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -1203,11 +1203,8 @@ xfs_file_iomap_end_delalloc( truncate_pagecache_range(VFS_I(ip), XFS_FSB_TO_B(mp, start_fsb), XFS_FSB_TO_B(mp, end_fsb) - 1); - xfs_ilock(ip, XFS_ILOCK_EXCL); error = xfs_bmap_punch_delalloc_range(ip, start_fsb, end_fsb - start_fsb); - xfs_iunlock(ip, XFS_ILOCK_EXCL); - if (error && !XFS_FORCED_SHUTDOWN(mp)) { xfs_alert(mp, "%s: unable to clean up ino %lld", __func__, ip->i_ino);