From patchwork Fri May 18 16:48:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411335 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 8182960353 for ; Fri, 18 May 2018 16:50:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70ED128619 for ; Fri, 18 May 2018 16:50:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65C49288BD; Fri, 18 May 2018 16:50:03 +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=ham 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 E5BD128894 for ; Fri, 18 May 2018 16:50:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 140106B0626; Fri, 18 May 2018 12:49:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0C8D46B0628; Fri, 18 May 2018 12:49: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 E367C6B0629; Fri, 18 May 2018 12:49:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 9D9E06B0626 for ; Fri, 18 May 2018 12:49:43 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id 89-v6so5312099plb.18 for ; Fri, 18 May 2018 09:49:43 -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=CvhKna67/4RCZ1mluUht4yCLbm0g5uevfR9UEfYckko=; b=JMgbSD9Pf7e2uguTh71IZvgU2efy+IgXu9GDMYfWf78pI/a0POXHDuLFFqlTg2vo7c KVocx3gaLpwA956fBIj9fy+ggFUCrw04jig/kwngBN/1wPHNa0lpk5mK7Wrd1zB7rLvF HKdjSoPGl3Q59zcNgIzCTIDuhtnZsoJTPax5GhHycLPY4dIsvhmIqV9eaDvttlYFUEKx B6GFaS4Z28/qW5lXd2ystq1mW/29jQvhafnqm/n5FZTRcjO9oCHaHcD06z98L2NIxyJb vP9y99mHkpzlCjHq2MgKF8HYNM+mS4vMAfhg8UK1AvYTvGt/5w7znMw/NTG8PG/JbO6j Obxw== X-Gm-Message-State: ALKqPwfjVgUiJalmxiG5vay5SFaLEGkIhjGnruSiZqFeLOfOBlOvDFc8 +hbTXwMeiDf+u+Zw9LHXa7d6677j1KU3tVQW/SkfoTOx3/xDJ58QbZy42JVRJKPHPYKqunTtIvX 9rAzozFpiL9Ds55qQ/qDXKFYxH9uOXt4XNsQaUza53nWfwk3GZ6Srx16R9103XDI= X-Received: by 2002:a17:902:7d09:: with SMTP id z9-v6mr10467447pll.4.1526662183340; Fri, 18 May 2018 09:49:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq3Wr+jAs5VMkzf/IUIpGWhCJJ3YSAlhSXRhll2mqGnRgKcxGMbapzi2PY1QopRkdR1pAj6 X-Received: by 2002:a17:902:7d09:: with SMTP id z9-v6mr10467421pll.4.1526662182694; Fri, 18 May 2018 09:49:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662182; cv=none; d=google.com; s=arc-20160816; b=RZyhR1NYtpd6cB6QYsaT0AfD3+vOFjK8jMH4OPuw8RHC4tK+NatAmW0a2QustvD7qU OJZbVFx6dq9UrZdvfzy+gjbSgv7vg4u/JNU2n9zhimiXiVrX9dACXsewnMb3N/rVWu6n NsuO1/BWDBvHe41cCnuKXO6qZvKwlqBkU+prWLg9+0eeT8fA9JrVRDQOpYq+sPtwB+Jr Wygdw596aIKhBkg/F8XiVxxGOZEt5cNRaG/ohL2Nm4LGYmbY02Wxicy7febdC4oXcZNe WP5rj8qvBx8H/jPmhwE4IK38jFugmcOZHH9YM0INK2Z5Oc4gSwK/cj4u7ARz1uun5jtE ggJg== 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=CvhKna67/4RCZ1mluUht4yCLbm0g5uevfR9UEfYckko=; b=ukybrf6d5X+aUDA5Of+QNinX+mS895v7Elcl5LN3/1V3D7GFPvbhcNTN+3RhgrrW17 Sz5Q10Kc1HgES7QUFTs2SbeYbVYcGVrYuUB7L/5y4/InLRZkhf3zGTCHTNZ3UDMmGMsz JbwJya+adsoDV738yh+RjBXf7NqOp0ei0j2wSxeMAj650VMEA6Ult6xvcWBpCDIwBMZQ bTUXd2mCkborZjGZl1d99j/t+EswbP7iXMEOWjm94OqdLlj01oPcjBXRmaZmiOyrlfaY KeFMw1W/NvnDv0coAXhTLKTurT6YAh08534qOyhWH7xnGvm166sNWCWqaimcEzAILhNa Ps2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=aqWaMR+T; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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 y64-v6si8263794pfj.239.2018.05.18.09.49.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:49:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+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=aqWaMR+T; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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=CvhKna67/4RCZ1mluUht4yCLbm0g5uevfR9UEfYckko=; b=aqWaMR+TzxamG6Bjnco31Zey7 ZQizdIdM208EJU9AgyAwxlKOhlj6EVh191jr1SKc9yipI7txcsgZO3eaQAZB8btn0VhhnEqsaUjsh sYWMPUfOfHTYS+HGhuzk4Moy+jaS49QcFpLNjO5jUm4conJKBIHSc4jkFdEnTSsPYvLuXcPIhv7Bl 7vZCRvtBWBVq+FMD7uN2kZ+3icQlQlcIcW5J1hrjifC7yR0Uv3/LxeZc/kNgsguShUsdx+HE3OTdk 6IPMq9zr8pRoAp2BiTiHZCY1Af8VlVqy6epH5qk3lzj+lV2ctLDX7pjY3BpgxTTQpdObIJSO6L7zI m+7gVDYfA==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiZX-0006pJ-Vc; Fri, 18 May 2018 16:49:40 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 23/34] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Date: Fri, 18 May 2018 18:48:19 +0200 Message-Id: <20180518164830.1552-24-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518164830.1552-1-hch@lst.de> References: <20180518164830.1552-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 Signed-off-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_bmap.c | 6 ++---- fs/xfs/libxfs/xfs_bmap.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 7b0e2b551e23..4b5e014417d2 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -3799,8 +3799,7 @@ xfs_bmapi_update_map( mval[-1].br_startblock != HOLESTARTBLOCK && mval->br_startblock == mval[-1].br_startblock + mval[-1].br_blockcount && - ((flags & XFS_BMAPI_IGSTATE) || - mval[-1].br_state == mval->br_state)) { + mval[-1].br_state == mval->br_state) { ASSERT(mval->br_startoff == mval[-1].br_startoff + mval[-1].br_blockcount); mval[-1].br_blockcount += mval->br_blockcount; @@ -3845,7 +3844,7 @@ xfs_bmapi_read( ASSERT(*nmap >= 1); ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK|XFS_BMAPI_ENTIRE| - XFS_BMAPI_IGSTATE|XFS_BMAPI_COWFORK))); + XFS_BMAPI_COWFORK))); ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL)); if (unlikely(XFS_TEST_ERROR( @@ -4290,7 +4289,6 @@ xfs_bmapi_write( ASSERT(*nmap >= 1); ASSERT(*nmap <= XFS_BMAP_MAX_NMAP); - ASSERT(!(flags & XFS_BMAPI_IGSTATE)); ASSERT(tp != NULL || (flags & (XFS_BMAPI_CONVERT | XFS_BMAPI_COWFORK)) == (XFS_BMAPI_CONVERT | XFS_BMAPI_COWFORK)); diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h index 2c233f9f1a26..a845fe57d1b5 100644 --- a/fs/xfs/libxfs/xfs_bmap.h +++ b/fs/xfs/libxfs/xfs_bmap.h @@ -80,8 +80,6 @@ struct xfs_extent_free_item #define XFS_BMAPI_METADATA 0x002 /* mapping metadata not user data */ #define XFS_BMAPI_ATTRFORK 0x004 /* use attribute fork not data */ #define XFS_BMAPI_PREALLOC 0x008 /* preallocation op: unwritten space */ -#define XFS_BMAPI_IGSTATE 0x010 /* Ignore state - */ - /* combine contig. space */ #define XFS_BMAPI_CONTIG 0x020 /* must allocate only one extent */ /* * unwritten extent conversion - this needs write cache flushing and no additional @@ -128,7 +126,6 @@ struct xfs_extent_free_item { XFS_BMAPI_METADATA, "METADATA" }, \ { XFS_BMAPI_ATTRFORK, "ATTRFORK" }, \ { XFS_BMAPI_PREALLOC, "PREALLOC" }, \ - { XFS_BMAPI_IGSTATE, "IGSTATE" }, \ { XFS_BMAPI_CONTIG, "CONTIG" }, \ { XFS_BMAPI_CONVERT, "CONVERT" }, \ { XFS_BMAPI_ZERO, "ZERO" }, \