From patchwork Wed May 23 14:43:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421643 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 647B06032A for ; Wed, 23 May 2018 14:45:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5551128733 for ; Wed, 23 May 2018 14:45:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49DF428868; Wed, 23 May 2018 14:45:58 +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 E2AEB289B1 for ; Wed, 23 May 2018 14:45:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BE3E6B027E; Wed, 23 May 2018 10:45:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3183B6B027F; Wed, 23 May 2018 10:45:15 -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 196B36B0280; Wed, 23 May 2018 10:45:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id C7BED6B027E for ; Wed, 23 May 2018 10:45:14 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id 62-v6so13145839pfw.21 for ; Wed, 23 May 2018 07:45:14 -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=UMoZGzxRBSaf2KFX/HT6BbQhjeCZnV5SEEI3wF394ThEwi1OA9s4CtOlDk/zOeeECT vp4ad8DNQYQtcypvvxFzlowAT4Suzn2IDucl2v4MIN8QAZ5mcv8uQRDV+7SajPJY/VA7 XMW4i++Dd6N/cYA+kGrXGGhxoz3TETtFNZAHlOg5noNVQ0omfMj1SFgSYCba83Utb95m 6dkom8B3988AXe+anaUGrlMDKtlBZVFB5BRq0+CM6k02kpHc8ZREqIRLOqwSG6J7Vk87 NxrXBUzrN3qf+6ZtOSoRUTCL6uxsxOaJFV+5OmXBfI893kpAGcq5kWg/JP2t5LQYe7nE bAlQ== X-Gm-Message-State: ALKqPwfPq1W5r5kD7WADtgtOrjS/VdnenAus6I29App1UhvTkWbWOvEq 6Gb8yc86JxqGQ3MNpZYTrKzfsOmNbhl3SOFzppaUS0GHIU4d9PiDSYAyXLnWlclvN7Ig6jwTe5e rrzPZGZzJfYhbrlPVVKa9SS+05cfYhjNNu7I/ne0hWd+VKZB1BL4lnthRyoYLKKg= X-Received: by 2002:a63:9a49:: with SMTP id e9-v6mr2646031pgo.251.1527086714466; Wed, 23 May 2018 07:45:14 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpw/tUHhntyxpwryAk/Pw9hI3cZ6GC0GR7PNIONCRtsbN1e3cHa9c1CIwADZHVfiJA5IL3c X-Received: by 2002:a63:9a49:: with SMTP id e9-v6mr2645998pgo.251.1527086713714; Wed, 23 May 2018 07:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086713; cv=none; d=google.com; s=arc-20160816; b=nTnhbzcQ1RxSoFKOziHyi+ETUR88jca5lnKEaQa4swNEMMPMpDnBpskf1uSB+SYQtn UfAh8edZ/wDSiJgFbR3LY0rnVEmruE8VSjHot0CUVTihHOOw2kPoV1/5pnHMnvLrMb2O ksUSaAxtUG6mZBggTQF3AE16fQAiUrlEzA25O8ZySfdjpi0gXBhb9uWCSENxpcsGm8NZ /2gENHuJedyuaITVV+W2EYarZkAsMAoq4lRzTloUpsjBYnT8uxUDMEP5xcY5Nvl3cFy0 3wdb38Ez+w5tM0jXm2H3+Nx8TRYNwu22NAxhH/XxsEGnoTvGfWyr9FhSggA3RfP3Qq4h vupQ== 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=Qq2ooiM7tyUglbnQMLV1PMm2LYhHDM1kVDKD/K4n5/+Al+b4HydFCh3PH8L9ScV8Ci r1xKh67sxohTNvLDznXw/i5vHGBbZ25O/r4y4lbR2uUMvLg1PpfMUVwk5M0cHN1SumdC JmIc/TAAQdFZiFIgAZ04SjcEwHqv22DbQfqNUFEeWyoseaIBye9SzVnMXoAOeH6mTuXo l0BZuHTp6w4qls36DdK55QPnRKUHG/LxvP3yqi7L5SHaRzK/zuFUklLXFC6bqxAf/S2E bu0wKf7wMYL/57axxg4mPsxWzujW1YNlYsu+Qc7R+0hMqfClGK6JKTP7Ol9LmMEceqCg wS+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=bFQ9rb77; 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 j91-v6si18500431pld.402.2018.05.23.07.45.13 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:13 -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=bFQ9rb77; 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=CvhKna67/4RCZ1mluUht4yCLbm0g5uevfR9UEfYckko=; b=bFQ9rb77lC3ULaQwNq/k/owaS 6ZU9DG16dyDo74XEp7+I3P1NSOFdPjo2RCIDOpGEHuNpklrY1Vlq8acoJwUDpCPhDfyfgPQM7E+iN KGslJoJj9c8mWo4MInCFrFKAWT74uftuyZzuSu4rY5hPMKPMqQ8mbMIOHPYU57lxarlMac1eUHZZ7 ryw3X03/ZGLB/RpFDDVga89L9rAnRU6Q+7sOubZFqv32Bc0G1E3sKXT0yGb4dxlTUhvZ5F83h3i+t NDCsMfonlZnAcZAx0WZGUTEHflS5vyCfQZNjwFAVmUdYySewEnw+8C3GEj2MK0yZ4ztPiYomTuNAT qvrjyqIGQ==; 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 1fLV0p-0000tM-LW; Wed, 23 May 2018 14:45:12 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 23/34] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Date: Wed, 23 May 2018 16:43:46 +0200 Message-Id: <20180523144357.18985-24-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 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" }, \