From patchwork Fri May 18 16:48:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411265 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 715BD6031B for ; Fri, 18 May 2018 16:49:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 608E528619 for ; Fri, 18 May 2018 16:49:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55253288BD; Fri, 18 May 2018 16:49:15 +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 B36F428619 for ; Fri, 18 May 2018 16:49:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DBD36B060C; Fri, 18 May 2018 12:49:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 13F066B060D; Fri, 18 May 2018 12:49:08 -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 EF7FE6B060E; Fri, 18 May 2018 12:49:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id A500E6B060C for ; Fri, 18 May 2018 12:49:07 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id p19-v6so5355930plo.14 for ; Fri, 18 May 2018 09:49:07 -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=R3ZkyZnV5VAO4NcYPhPYcA6UHDK7/6mS6WJJ8httF1g=; b=ZGZTGDfuaRSw4LrHRBT64HzvjipcQn3ys+NP4sWRJrMweasJmz3V0xDiZJDDjtQNMf gRLngh3WnMqdB2h7cgwd5OcPl229Yr8NRh0oePKNMdSvDul+34WRF5JaKVR76W4BrE1i kBzTCMgDPVWcB0j2Jy4icc7SJFVXqfDLpCW197UbVEz5UBuI/KbLrCMPdJbM/Y/WLlTo aW0f87ueEDInn0RHGjgNEOJJcjTOhugW9dSxHNhGiebjiZvKQE3Pk1Simpe2tSh4OoF6 54+HjJYTFc9qlr1PPKsLTKdxwVypOeRSvmjePzHO5D8wwtu0oC5FJzBHkwNQZeeSXYg0 TMnQ== X-Gm-Message-State: ALKqPwfmFvEbF5hfGFnRE/EvuiKA5Epb7iPJkZ0Ha6dxxNMRawZUx9Jn SowR6GvTd2dPFt3afTHn6RCitBS71kdlaxVZOLRySqZJqf8BN9ezIT4fYPoAISjvM4Cgr1dH5yO g7DS3b9VB2jeotgy+ifzTvZ7xB67AHClH4rMaKDwoGPFP+ksArsBQA4R8t6TX8zc= X-Received: by 2002:a62:4387:: with SMTP id l7-v6mr10029658pfi.55.1526662147339; Fri, 18 May 2018 09:49:07 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp6lvhYQ5C0vzZ97GpXts+zs52S5CQ8F2ZanKc4MCZsyVkC6ZWxLnRTJnNNdUPEW1+cuKay X-Received: by 2002:a62:4387:: with SMTP id l7-v6mr10029624pfi.55.1526662146600; Fri, 18 May 2018 09:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662146; cv=none; d=google.com; s=arc-20160816; b=V1jMOXs92lwurZbNn4YbihN6KEsv+LI0h1+t199zHQD3wlR62yZl/4Db0sSC3oRPkR KtYLpHyIJ8Tm0SnPzPGajJ7yuFN/+M2p4MwB9A5pjmBi1IG6h4EdsVh+Kp0jem15xEX0 Ct5b0CZns09mq0BmDKbnXR+VPITJL9vJ5q9qhq9QtvovuIBEbr31eUnBzQfTZbeZf21W F2QwTyYsleH9vcm/P6ZsMdqScweEKUHkqrxOyM7QU10YXVdmksmDcB3Njalj3P15IsP7 dMCARN9223QkhUuyXP7KlSoC4u2+IW8XcaZvuxzEgh4/ARC+6XNt7MB3yA7683MKZIzc 6eLA== 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=R3ZkyZnV5VAO4NcYPhPYcA6UHDK7/6mS6WJJ8httF1g=; b=UbMk8HzkTiSF3mxzEXDKtr+IJFrUfG9FdUWymiSKuW0eGZGI5Lwm0q48JWoBOFKAsJ wuyiOjbDPja+gMtKWLXlqElRq2Mylypg9sw8nB2by9IGmDdS3wnC0vQJ31YzT3zjBZLK PFu9tKwR/Oy3dnp+Acj/5smQ/rutrRQTvd7qnBSeFUga+J95rVWN4s8KKOVc0qyLOBuh Cfic8qUVHZiRLXe82rYNbxGd/zyUvVxltyPI2GwpoyVr8K8+Gp0+PbY+fr8ztPLA6M6d fgx4wmb0i7mTLaZEzXvf1M9tUUmjnllERCINUnyM/byARR//4i03PZn1176kE7w1Gb5I aBwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=dOz0Zx8Z; 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 p12-v6si6380056pgr.660.2018.05.18.09.49.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:49:06 -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=dOz0Zx8Z; 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=R3ZkyZnV5VAO4NcYPhPYcA6UHDK7/6mS6WJJ8httF1g=; b=dOz0Zx8ZdWFvCxYF46WDUmMJS ILnNuzCC1XCuXw7UsSbntU64d6vCTvzWmF+Z3++aMp45CNUNivGEpFfzv92xRWVVVvoRjAHxZZhMU 60wxk93Mdl1vi04rxofTH9igFVXZa6kJl7g+SoqXL4f4HeWqIIGdSfwK4xmgZ5UL1yNu38nRk0ZoZ P3KEQvo68bmguJKY3KldVwQ65By9FjbtXy8mDQDjMTY9Q20BzR4Hk3H8r7LTuq/K5iHx8cLRurP10 44U0GPamXrzw9Mh/5R8qcYypsvq/KS+1ULNklW1RJTBTSCgoW2HvuitreTp7smlumZMg+JsfDK8vU x76hn3tbQ==; 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 1fJiYz-0006Xa-Oe; Fri, 18 May 2018 16:49:06 +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 11/34] iomap: move IOMAP_F_BOUNDARY to gfs2 Date: Fri, 18 May 2018 18:48:07 +0200 Message-Id: <20180518164830.1552-12-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 Just define a range of fs specific flags and use that in gfs2 instead of exposing this internal flag flobally. Signed-off-by: Christoph Hellwig --- fs/gfs2/bmap.c | 8 +++++--- include/linux/iomap.h | 9 +++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index cbeedd3cfb36..8efa6297e19c 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -683,6 +683,8 @@ static void gfs2_stuffed_iomap(struct inode *inode, struct iomap *iomap) iomap->type = IOMAP_INLINE; } +#define IOMAP_F_GFS2_BOUNDARY IOMAP_F_PRIVATE + /** * gfs2_iomap_begin - Map blocks from an inode to disk blocks * @inode: The inode @@ -774,7 +776,7 @@ int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length, bh = mp.mp_bh[ip->i_height - 1]; len = gfs2_extent_length(bh->b_data, bh->b_size, ptr, lend - lblock, &eob); if (eob) - iomap->flags |= IOMAP_F_BOUNDARY; + iomap->flags |= IOMAP_F_GFS2_BOUNDARY; iomap->length = (u64)len << inode->i_blkbits; out_release: @@ -846,12 +848,12 @@ int gfs2_block_map(struct inode *inode, sector_t lblock, if (iomap.length > bh_map->b_size) { iomap.length = bh_map->b_size; - iomap.flags &= ~IOMAP_F_BOUNDARY; + iomap.flags &= ~IOMAP_F_GFS2_BOUNDARY; } if (iomap.addr != IOMAP_NULL_ADDR) map_bh(bh_map, inode->i_sb, iomap.addr >> inode->i_blkbits); bh_map->b_size = iomap.length; - if (iomap.flags & IOMAP_F_BOUNDARY) + if (iomap.flags & IOMAP_F_GFS2_BOUNDARY) set_buffer_boundary(bh_map); if (iomap.flags & IOMAP_F_NEW) set_buffer_new(bh_map); diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 13d19b4c29a9..819e0cd2a950 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -27,8 +27,7 @@ struct vm_fault; * written data and requires fdatasync to commit them to persistent storage. */ #define IOMAP_F_NEW 0x01 /* blocks have been newly allocated */ -#define IOMAP_F_BOUNDARY 0x02 /* mapping ends at metadata boundary */ -#define IOMAP_F_DIRTY 0x04 /* uncommitted metadata */ +#define IOMAP_F_DIRTY 0x02 /* uncommitted metadata */ /* * Flags that only need to be reported for IOMAP_REPORT requests: @@ -36,6 +35,12 @@ struct vm_fault; #define IOMAP_F_MERGED 0x10 /* contains multiple blocks/extents */ #define IOMAP_F_SHARED 0x20 /* block shared with another file */ +/* + * Flags from 0x1000 up are for file system specific usage: + */ +#define IOMAP_F_PRIVATE 0x1000 + + /* * Magic value for addr: */