From patchwork Wed May 30 10:00:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438237 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 BF88A603D7 for ; Wed, 30 May 2018 10:01:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0B30288B7 for ; Wed, 30 May 2018 10:01:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5A8A288EF; Wed, 30 May 2018 10:01:09 +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 4DC39288E8 for ; Wed, 30 May 2018 10:01:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D03B16B027F; Wed, 30 May 2018 06:00:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CB2AC6B0280; Wed, 30 May 2018 06:00:52 -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 BC8636B0281; Wed, 30 May 2018 06:00:52 -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 76B666B027F for ; Wed, 30 May 2018 06:00:52 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id u10-v6so4941883pgp.8 for ; Wed, 30 May 2018 03:00:52 -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=DOKu71szw+7QCCADYbxSy69lRHuyBjqvitTymtAe0r6ddUCa5WApr/fgUvc8MZv8Ar 7oVLadxxcCuNWccg0Vx8cipS3v5F/s07K0wRpoqV7LErZQ6sDXY8ubLhrvw7kEqhVnd4 ydWp2HIKd0CKBr53M7z/dKCIMuzk+rLG7xSE7BWIG6KXQV3LaHcifMLzoBPC/vB2xGoD qADy5Ieqaplb/kkgFejWM693zmh7eJOgf7laN2FHngJzGbRzgsD1Hd/+QZ/tTZPI5vZS sf5Wb97zBieYNvnn3QMY0SBXcb5wkRHlz8vWPJzOuWH344dGdYIUiznTSMxL/kOWMnyk t11w== X-Gm-Message-State: ALKqPwd8w5uS33yKx1NXOg++5kwNNtsdd77RF81E+xqSonp9VInijbSx oYcosV5SnXcDBOCvYyTgkLAh0ED9VfB1l5EgkM3HLOsF2/8dYVvAZmlW9zN3KaG0WuPVfoaB70C teySkPpXPWQJwLpJRN4QxO4g9AIEfw9h8FTyhv4BCPAFdKJnaKtK7eMcxPs+UQEE= X-Received: by 2002:a17:902:8d85:: with SMTP id v5-v6mr2206213plo.93.1527674452162; Wed, 30 May 2018 03:00:52 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJil5uaWK0ADvJsAIKAdzINWpdBwKSCYV0AtpXdkIpxuLFzl4PgaRWWycUuRcZC6z8f4Q/b X-Received: by 2002:a17:902:8d85:: with SMTP id v5-v6mr2206164plo.93.1527674451382; Wed, 30 May 2018 03:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674451; cv=none; d=google.com; s=arc-20160816; b=uMR2CHRoXGRBRIUXSxtkT32J42i97KnTWGIeebxrBCTSuUrW2UBm2TR+mdvM5arNRp 6V/C4/v6s/xVvGoiQNX540ACUTtfmQxvzegLEy+kbJVrzpVWhYGHlPrxm89EJ0ZdT9CA MXNnJKRvuhtjuTlDfjmLrWk6jPWwdmUigZaOwX4GrNcnWHyO2wTxEKw5bU99Z2nehF4j UI2HS0tfZfmncScMF69JNC+ONu3CuO97bWQeiulKZHy1XidoF4qCXuZSb0xZ6knQMZFY GVokJkrTyIepS7mXiYmOBANP6ICAMpbWczMlPbeULzBf5TnalufD4zP7K96qebT2b3u4 61Jg== 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=q11ApD+HgfSRJKCwjd/dFaqGzCaPe+fUPNd4brT68mlU3C5vO4KK+jckLsFuX1BKlv y5BCiJtQmBPbFw1Mt92BPEZKmmYUFM05lyFP6WKti/SPC3zXzZHeW1maXL1gqo2czQcL fRwuOkpHwpMEo91liFC7jS0RKTMdu9QI/803gnq9GLwzhLICqclHNaQrW03TZdyV/HZ+ zdgg7W7/setaLh6WszyQ58APc+57mz83WkJ58wZ8AbxJCde5Bi/9TqGgVXZJlNVoo8m0 VKGb6trSILloK1mIxpbAZJVvEzgTrY3WlV03l1X6ZI2mcqO4nkyqcvOxtgh3r5TLesZa 4dmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=bqvbZbzR; 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 b40-v6si34348933plb.44.2018.05.30.03.00.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 03:00:51 -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=bqvbZbzR; 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=CvhKna67/4RCZ1mluUht4yCLbm0g5uevfR9UEfYckko=; b=bqvbZbzRKJQDN9ixF+Zc+OdL0 tqpVy/FzJBTNxSqt/UjwFBdYpvjQdYo6fU5Z6R+4tOYj+IQj1QSoWifuiWACJMqMTpkutIMAZ5SrI vj8GNSreNGV0L5jjMWylH5RcQH18hvopHnHSuNcOi9PvZKYg2Ksvumd374kYcs9l10LBnAloSvn9l 8uPkYYm4lTw6u210UpgRQvrtCcgkBY4Hap1YcDuq1h4Rc3meQTvNROlB7pbeiZO496ql5vFzBTD3j iKi/6r8/o0n7NBIP8TRhomm8HC3/cGqxZwnYhdXN+SX5HJFqobHlgdTBXgkIllNxhmIN2AHr25IFh jJ1mntiNA==; 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 1fNxuQ-0008LN-Q4; Wed, 30 May 2018 10:00:47 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 07/18] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Date: Wed, 30 May 2018 12:00:02 +0200 Message-Id: <20180530100013.31358-8-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 Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- 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" }, \