Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp7947270ybn; Tue, 1 Oct 2019 00:17:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwO94RiGIxUJfr9ZgtEB4ZiGdPKx5tkisus7Pc8gPwf62fkff4d0JiFfFDZ893F1zl3lJ5G X-Received: by 2002:aa7:d718:: with SMTP id t24mr23470187edq.300.1569914265379; Tue, 01 Oct 2019 00:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569914265; cv=none; d=google.com; s=arc-20160816; b=VxyTN3Tb7ssBr8o6uJUrl4CnWh6BjjGzArHpr3kQY3FTiyn+2dh/Uv0lSUY6lKPMjH e4dh06Z19jQ7E80nf6JVUlbN7g+jlvUa6d9fw9VBH6NBVAylHlUPaUccEcqwmCr+VUA8 aXEzgSl0h1a3s1FyrMptVpubKZi6503IaXT22nc4MRLFjy7THR8ML6GgCR7Wpp/lsTs8 Mec2LAky/fxqdsrD0IR5Zejzktr1nPpV9x0483dSGXHUJq82eIuUjHfrNLPMEPoBrdcb 6fqrQmG/c2ZTfFZsL6z3m6QHA3vWe/r2BSQTa/FFI29EgNjhPm+ClFYcdzMA7YEQmLyK y69A== 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=1irl0AgCvFo2qfN/O5DEHH2lBXUVCJy0lnRalJzwcEY=; b=v65rEOT4opb3VwhvzF9XDDWOwqIbBPpHKYGiPkJ0hCDxNbjUvk3Quu2fwljGVxPQmD i9wRFYmKpDg0TwVfgk55h0fCcBgE5gZNnCdbg7rN71sL759gnPQ/vwkcImk3310nHpyY mZ7mtYQzkbsQXjt2F8GsKm7HN6nT/66y2jO7NtS4CHZeqHRJhr7rtQHLQPVwLJbjn6wl etFZCwRZRQTuvKuOT9ZxWVTJWRfAnEbyIHJodYev9zk8h/RRkSTjuLZ97YbShrP3scG4 FS8y0qta7WwDf/AWlONvh0Ytu5aRslsvmvrQrqU/L19SJcEmIzrtt+SQOZcjupKIno9X uwjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=JuaLtyJT; 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 d27si9101766ede.381.2019.10.01.00.17.20; Tue, 01 Oct 2019 00:17:45 -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=JuaLtyJT; 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 S1733047AbfJAHQp (ORCPT + 99 others); Tue, 1 Oct 2019 03:16:45 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:45618 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733005AbfJAHQo (ORCPT ); Tue, 1 Oct 2019 03:16:44 -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=1irl0AgCvFo2qfN/O5DEHH2lBXUVCJy0lnRalJzwcEY=; b=JuaLtyJTWnlE+5SsMKEwf/ZW/k gNnm47jobHglkzd+OIkflDzqCbBEuSd0GrQD1Oq3Gj5FWOxtUrmu0OY2mcIFMzep+f71bjR1Nw+pM 4ltrjT051Poxrs7oEOjQrxdjCGot0UUzipO5spFLn0eaIZ5e5cYNtOwpMtLJzSs5yBZ4FKUB6Al3K tNd0OHfsftJpPspQgUXl+KU9WxyawJHL8QdhpG9ePNO12uta2Kr1I1UKETVfVs8/eM1hM0kdaMIbv 2Wr/4nOw6PPMaS+ql7cZ5fqNO2WbsFLZTi5LjW5yAa1MZgVjImF4t2Oc4SsEaO8MQ3Wlz/PtsLHrv D17u8Vkw==; Received: from [2001:4bb8:18c:4d4a:b9e5:f9f0:a515:3f0a] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFCOo-0001VS-7i; Tue, 01 Oct 2019 07:16:42 +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, Carlos Maiolino Subject: [PATCH 11/11] iomap: move struct iomap_page out of iomap.h Date: Tue, 1 Oct 2019 09:11:52 +0200 Message-Id: <20191001071152.24403-12-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001071152.24403-1-hch@lst.de> References: <20191001071152.24403-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: 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 dcf95e8b31fe..da1dea16ebe8 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -23,6 +23,23 @@ #define CREATE_TRACE_POINTS #include +/* + * 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 e79af6b28410..5d736d3caf08 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -134,23 +134,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