From patchwork Thu Aug 25 23:45:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9300453 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 E1EF060757 for ; Thu, 25 Aug 2016 23:46:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2DD72939E for ; Thu, 25 Aug 2016 23:46:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7A36293A6; Thu, 25 Aug 2016 23:46:50 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 41E0B2939E for ; Thu, 25 Aug 2016 23:46:50 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id 3ACD58086; Thu, 25 Aug 2016 18:45:46 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 37FE58084 for ; Thu, 25 Aug 2016 18:45:44 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 8DB9AAC003 for ; Thu, 25 Aug 2016 16:45:43 -0700 (PDT) X-ASG-Debug-ID: 1472168741-0bf57b53142098a0001-NocioJ Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by cuda.sgi.com with ESMTP id AQROxnq6WKyN4i1Q (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 25 Aug 2016 16:45:41 -0700 (PDT) X-Barracuda-Envelope-From: darrick.wong@oracle.com X-Barracuda-Effective-Source-IP: userp1040.oracle.com[156.151.31.81] X-Barracuda-Apparent-Source-IP: 156.151.31.81 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u7PNjehQ027739 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Aug 2016 23:45:40 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u7PNjdBs020780 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Aug 2016 23:45:39 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u7PNjcUw032596; Thu, 25 Aug 2016 23:45:39 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 25 Aug 2016 16:45:38 -0700 Subject: [PATCH 20/20] xfs: cross-reference the realtime rmapbt From: "Darrick J. Wong" X-ASG-Orig-Subj: [PATCH 20/20] xfs: cross-reference the realtime rmapbt To: david@fromorbit.com, darrick.wong@oracle.com Date: Thu, 25 Aug 2016 16:45:32 -0700 Message-ID: <147216873241.3688.11988964019948967528.stgit@birch.djwong.org> In-Reply-To: <147216860614.3688.3200692982609112535.stgit@birch.djwong.org> References: <147216860614.3688.3200692982609112535.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0021.oracle.com [156.151.31.71] X-Barracuda-Connect: userp1040.oracle.com[156.151.31.81] X-Barracuda-Start-Time: 1472168741 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.176.25:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 2770 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, UNPARSEABLE_RELAY X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.32328 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.00 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: linux-xfs@vger.kernel.org, xfs@oss.sgi.com X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP When we're scrubbing the realtime metadata, cross-reference the rtrmapt. Signed-off-by: Darrick J. Wong --- fs/xfs/xfs_scrub.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_scrub.c b/fs/xfs/xfs_scrub.c index f0cd21f..61c99ea 100644 --- a/fs/xfs/xfs_scrub.c +++ b/fs/xfs/xfs_scrub.c @@ -2405,8 +2405,15 @@ xfs_scrub_bmap_extent( } /* Cross-reference with rmapbt. */ - if (xfs_sb_version_hasrmapbt(&mp->m_sb) && !info->is_rt) { - xcur = xfs_rmapbt_init_cursor(mp, NULL, agf_bp, agno); + if (xfs_sb_version_hasrmapbt(&mp->m_sb)) { + if (!info->is_rt) + xcur = xfs_rmapbt_init_cursor(mp, NULL, agf_bp, agno); + else { + xfs_ilock(mp->m_rrmapip, XFS_ILOCK_SHARED | + XFS_ILOCK_RTBITMAP); + xcur = xfs_rtrmapbt_init_cursor(mp, NULL, + mp->m_rrmapip); + } if (info->whichfork == XFS_COW_FORK) { owner = XFS_RMAP_OWN_COW; @@ -2495,6 +2502,9 @@ skip_rmap_xref: /* Free cursor. */ xfs_btree_del_cursor(xcur, err2 ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR); + if (info->is_rt) + xfs_iunlock(mp->m_rrmapip, XFS_ILOCK_SHARED | + XFS_ILOCK_RTBITMAP); } /* @@ -2768,10 +2778,12 @@ xfs_scrub_rtbitmap( { struct xfs_mount *mp = ip->i_mount; struct xfs_buf *bp = NULL; + struct xfs_btree_cur *cur = NULL; xfs_rtblock_t rtstart; xfs_rtblock_t rtend; xfs_rtblock_t block; xfs_rtblock_t rem; + bool has_rmap; int is_free; int error = 0; int err2 = 0; @@ -2780,6 +2792,10 @@ xfs_scrub_rtbitmap( return -EINVAL; xfs_ilock(mp->m_rbmip, XFS_ILOCK_SHARED | XFS_ILOCK_RTBITMAP); + if (xfs_sb_version_hasrmapbt(&mp->m_sb)) { + xfs_ilock(mp->m_rrmapip, XFS_ILOCK_SHARED | XFS_ILOCK_RTSUM); + cur = xfs_rtrmapbt_init_cursor(mp, NULL, mp->m_rrmapip); + } /* Iterate the bitmap, looking for discrepancies. */ rtstart = 0; @@ -2807,6 +2823,14 @@ xfs_scrub_rtbitmap( break; XFS_SCRUB_CHECK(mp, bp, "rtbitmap", rtend >= rtstart); + /* Cross-reference the rtrmapbt. */ + if (cur && is_free) { + err2 = xfs_rmap_has_record(cur, rtstart, + rtend - rtstart + 1, &has_rmap); + if (!err2) + XFS_SCRUB_CHECK(mp, bp, "rtbitmap", !has_rmap); + } + xfs_buf_relse(bp); bp = NULL; rem -= rtend - rtstart + 1; @@ -2816,6 +2840,11 @@ xfs_scrub_rtbitmap( out_unlock: if (bp) xfs_buf_relse(bp); + if (cur) { + xfs_btree_del_cursor(cur, error ? XFS_BTREE_ERROR : + XFS_BTREE_NOERROR); + xfs_iunlock(mp->m_rrmapip, XFS_ILOCK_SHARED | XFS_ILOCK_RTSUM); + } xfs_iunlock(mp->m_rbmip, XFS_ILOCK_SHARED | XFS_ILOCK_RTBITMAP); if (!error && err2) error = err2;