From patchwork Wed May 23 14:43:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421627 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 F3F8560327 for ; Wed, 23 May 2018 14:45:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E524028733 for ; Wed, 23 May 2018 14:45:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA0E6288B2; Wed, 23 May 2018 14:45:46 +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 86C4C28733 for ; Wed, 23 May 2018 14:45:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF1536B027B; Wed, 23 May 2018 10:45:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D79576B027C; Wed, 23 May 2018 10:45:10 -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 BF79B6B027D; Wed, 23 May 2018 10:45:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id 76D9A6B027B for ; Wed, 23 May 2018 10:45:10 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id q7-v6so6733974pgt.11 for ; Wed, 23 May 2018 07:45:10 -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=fUbeRy1Hm6oij3qLlH2ntx1qljismLNPcjq+75ibsSw=; b=nAUbIKDQdktXmjy4ooN3daWpEolrqNrnet77GbhT+Ycqva8D+auz59M5Wr2r2aS6wD 1xB7dyhbscyIrqAta6DN2cbBTwnIDj42upoGqSF735XGIq4vxdwh0Wv5UXGEpe0YQj81 KPAHGc3biyc/5FPZbqHL147oUJZeKHyOwpudH+EW8dookq5E3QdHGAZjY7bLuibYNHOI 97uEQYrRZ/Dw3duTZDGyOUYsjHLmafQDmoZbIv6S84wV/lpE6sMgJQ9vWeTu7YYWYKzx HqUDfqshzVz0oSbdd1fkZKtZYEW+TZgF4JQNAI8Ycpwp00K0o2iBBqFl/rZ9PB64b0Ra +Zdw== X-Gm-Message-State: ALKqPwfmi3U+c3MoRMzoXswz/idRf6cgPrsV1/SCRBu8j48LxyYNxLwf O7mcBAOezYMcdh+ykGSd0hwH2y3ESCGTGYyX1pSfIoRCFs5cw3zr1k5OCFLiqdSVhHbjlBe2oPf nOELsQEyCoLuxieY/fQcG15S8tAp9HoQH0qnHc5gw008k6ghmvcxmZm1N214B4ig= X-Received: by 2002:a63:7e52:: with SMTP id o18-v6mr2522129pgn.399.1527086710161; Wed, 23 May 2018 07:45:10 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqw13Z6OXSKEinXbztjgKU93xM8MK6Su6es6wICbm2BADA7qrTnU7qHoRawcG7v3EUuB/bR X-Received: by 2002:a63:7e52:: with SMTP id o18-v6mr2522100pgn.399.1527086709424; Wed, 23 May 2018 07:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086709; cv=none; d=google.com; s=arc-20160816; b=wfovTLlQlQ1BFOevxzYUwjT2uoib+4x4yjSmDbMlz4mhQaaUbs29qhl0TGKoJ4PJuL NAtIutZaQN08V4lvNpe1bqCoP7cpgUVrNHcjMcN+B//Lh8jGXDOPVj/mML2FENrNV/85 g4VE4kKbYjvRVk3KezQ+bm3gktpadVnSWnrRSqa/4fUSWQ7S02jPZj4zdyX18pUz2+Oz 1LzrPOe4NZ3is+18u57mxvrlXlmXsxMLM/BWp2TOoIMVmhrZI6ZvhH4oSR6Agw1fdQh0 4YXIRWXrubyYsqbGnTk74SS1P5RPQeM4UiM8briG+Eh2Oe1TiQe6Aui/h0RV/nhAj8K+ UQ0A== 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=fUbeRy1Hm6oij3qLlH2ntx1qljismLNPcjq+75ibsSw=; b=UZBzZJyI6hAITry5vZb/JwN7N2UCilzykYfSw+H/2dIweU64RHFrdyWQ8RxPtEtlcD kSReoXMv7ISFRJHPRJtYZ4BYxHx3n8eGtGSc+UJ8MWELk81EuWhbxIzrrDwolDyWIQS5 rMUdDiyXfpilHSUMVMeASOt2N70BQiNo3Wt6AVYhKv8QJiHJPXZfZMxCc6kpOR2mx5p0 iYIsMVAHOTi+zu2BYfmtACb08XlyOJ9qORtRIfep/RLtpc2G9B49gVfPWJGeXcRsdads zk6GfeEk+DkzG2oIgh5ptFL8sOX9VDc8Amm5AcYZtR/UXuAMQ2+0h5gU2DjHPEmF56/p SEqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=XjdFoK4h; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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 y23-v6si4675946pgc.6.2018.05.23.07.45.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+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=XjdFoK4h; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+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=fUbeRy1Hm6oij3qLlH2ntx1qljismLNPcjq+75ibsSw=; b=XjdFoK4hZK512N62Du0YGKe6s go92vq2ay2lQc04gW50aO+RRW3fshWPOixgW7qss1aYgJof8HlWtX9FVBVMILm51Ix7nlLEWdA160 NM8Vh1/wtghe/ITSDHkcGs/ss695EptApUquq5SYLGgQzN0AzykH8lMNA9F27eGc86yFIF4tkd9VL XAB2FWgBmGApeT7ejfTXf/ZS0qMIm2BtdKeJuwA/KxTW0CpRGt8QprpaNXOoAb42Mkw6NVjTnd+5a Ql2ismgOeoENWrJwIziFHJZEp+GSd9Sk1W+m+V2b2GxModqO0N2AFmgSEPB3jIfUBTEFGljmZyeEU e9KGtcBVQ==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLV0j-0000dr-5M; Wed, 23 May 2018 14:45:05 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 21/34] xfs: move locking into xfs_bmap_punch_delalloc_range Date: Wed, 23 May 2018 16:43:44 +0200 Message-Id: <20180523144357.18985-22-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-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 --- 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 c009bdf9fdce..1a55fc06f917 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -711,12 +711,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(ip, ifp, start_fsb, &icur, &got)) @@ -738,6 +737,8 @@ xfs_bmap_punch_delalloc_range( break; } while (xfs_iext_next_extent(ifp, &icur, &got)); +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);