Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp1283290ybg; Fri, 18 Oct 2019 15:11:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqwp65mjD256rNVYoI1V5t9LI46+LD6w7XQSYqUmf5/SY/EdpSjd+aKhpZhIT7Std/5RHSdp X-Received: by 2002:a05:6402:21c2:: with SMTP id bi2mr12228170edb.8.1571436690122; Fri, 18 Oct 2019 15:11:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571436690; cv=none; d=google.com; s=arc-20160816; b=dKW5H0IClp1z3nBDYxEF71vWUY0mULKlo/AUkpp1vnv5PlmN8IjUTK0Eh8vLCLoff1 Pd6wx55zTRdw1ACyr+b2rus3X0PzPZ1tebLbD5gd2mQv+yeUHw6Z619Z/21ZRdolIjUO /6hfP0gPlJ6P3UHaMh8TTtXokI02wKCgon4LGjqMmn8FK37CxjCl3NE/WzX/tebGA+yd o7IFQmO5tt3zPDZzcdsTa8HE3iU04m/Pmdyz6r66WywoqPTBucHlQUEjFKTfbcB8K1at 4chQtM4TDrW3FDNWjXj8+7LPT8oDlKA6QFdejpyw2TsNIBHUneB8JOZQC+RYMqWe90/+ nADA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3LCOvHhI1d2tI4XsgInbF6NgLTLi4GG5UiaMnE6QtZI=; b=niA4S6VnDciXPl0ylhhkfvvexSZcHTGsazPOq4wONYoBlFO68VAOERRQp4/7E6CWP3 lf5WeMDkD1lIT7dpzKhjEjoHkWOkJQZUeDY6D32oXEx2iyG7yhWbOjzLAOpFCpaVYbR0 wFrp9GDK+x+oozWj4Jq+IPLMSk55RQgAbP3GnAqkQNX+1+BNGz+4gAFH6nGFHlbPmVC6 D/07hxY89ZYuzGBf3pD+4/MQXtipZyDNiy2HSX3BSQ9BjZ5jx4jwIOWS3XhUspyNe3oI x5BP/aOZmvvtkUTRF/XuAztUREuCctYH2qeC06oLGGz70gMvN4DiztdfhhZPCVfO2nD8 ENuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=IlnWhkZT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id si30si4046618ejb.92.2019.10.18.15.11.07; Fri, 18 Oct 2019 15:11:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=IlnWhkZT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395082AbfJQR5H (ORCPT + 99 others); Thu, 17 Oct 2019 13:57:07 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:49226 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395052AbfJQR5E (ORCPT ); Thu, 17 Oct 2019 13:57:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=3LCOvHhI1d2tI4XsgInbF6NgLTLi4GG5UiaMnE6QtZI=; b=IlnWhkZTRq141ZKHGylpzx4uEw 41ikMuzBreVnZmX4G9M/2PR8rVG1dGVCUlNbv9D94o047Pex+ZRuKVj0+SdkP4iuK9x2BiNuCV1Iz KQWgXbBq/L7WrlOISqYG1jfChOSa6+HevJ6a/jtC7bbcBxa90qYBuJsPjWo44J4OKZrl6g24VHx3K 164ph0/MLXogU7vueFglU6XURZBdrqA9SfYqVvA6tdbbGU7z6FjQtbOY2UK9g9ILRN1c534RaOp/8 JZ27i4otJc0Q21XyaqUAc6J6pHw/s/875jzfkG0VrV/mpoD7u6XKxTdDsjssApXWBUOIzr4NVulG6 c67evKuA==; Received: from [2001:4bb8:18c:d7b:c70:4a89:bc61:3] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLA1F-0001Nk-3c; Thu, 17 Oct 2019 17:57:01 +0000 From: Christoph Hellwig To: "Darrick J . Wong" Cc: Damien Le Moal , Andreas Gruenbacher , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Chinner , Carlos Maiolino Subject: [PATCH 12/14] iomap: move struct iomap_page out of iomap.h Date: Thu, 17 Oct 2019 19:56:22 +0200 Message-Id: <20191017175624.30305-13-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017175624.30305-1-hch@lst.de> References: <20191017175624.30305-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that all the writepage code is in the iomap code there is no need to keep this structure public. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Carlos Maiolino Reviewed-by: Darrick J. Wong --- fs/iomap/buffered-io.c | 17 +++++++++++++++++ include/linux/iomap.h | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 7b83a7ba2edb..f8ff96124a86 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -21,6 +21,23 @@ #include "../internal.h" +/* + * Structure allocated for each page when block size < PAGE_SIZE to track + * sub-page uptodate status and I/O completions. + */ +struct iomap_page { + atomic_t read_count; + atomic_t write_count; + DECLARE_BITMAP(uptodate, PAGE_SIZE / 512); +}; + +static inline struct iomap_page *to_iomap_page(struct page *page) +{ + if (page_has_private(page)) + return (struct iomap_page *)page_private(page); + return NULL; +} + static struct bio_set iomap_ioend_bioset; static struct iomap_page * diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 71fd12ee5616..8611f8bf2878 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -136,23 +136,6 @@ loff_t iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags, const struct iomap_ops *ops, void *data, iomap_actor_t actor); -/* - * Structure allocate for each page when block size < PAGE_SIZE to track - * sub-page uptodate status and I/O completions. - */ -struct iomap_page { - atomic_t read_count; - atomic_t write_count; - DECLARE_BITMAP(uptodate, PAGE_SIZE / 512); -}; - -static inline struct iomap_page *to_iomap_page(struct page *page) -{ - if (page_has_private(page)) - return (struct iomap_page *)page_private(page); - return NULL; -} - ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from, const struct iomap_ops *ops); int iomap_readpage(struct page *page, const struct iomap_ops *ops); -- 2.20.1