From patchwork Mon Jul 2 14:54:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10501669 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 0C0236028F for ; Mon, 2 Jul 2018 14:55:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBD5B28960 for ; Mon, 2 Jul 2018 14:55:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E01AC289A5; Mon, 2 Jul 2018 14:55:08 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75FBE28964 for ; Mon, 2 Jul 2018 14:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570AbeGBOzF (ORCPT ); Mon, 2 Jul 2018 10:55:05 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:55262 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752214AbeGBOzB (ORCPT ); Mon, 2 Jul 2018 10:55:01 -0400 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=zZDNNeqOCq0w5HLM04yWT0/vN+xwNlio1nbKCVu3Rgk=; b=YGE1mYVS1yv6pV+qmZM8KuuZt nSZC/Q1oJYw109VZ1g95ve39AETc+4pa8XEyGTsbxsyBvs761EAuddgToVgfKQkVlaM7u9r/Z0jL4 4UGrIDJRtlQvPbTwb4KhSkJWjR2ZQbm0IhZdQsfUvEExsU5XUWAiN9dDyuryVQaPVgZmwshxkKa4+ mIaE5Yf9RwnZnq0Oiw8jWyHtmcw4WYhjKrSp6aZ9j5RU7DasnkRg6IpuyJRswSN8OiRGIuYJVgvGR Ur1xTJaHa+33/0V29soE3aGWupQbwClAe753AZip9kGp+129IbB/dUZe2rSOAQ4Rs10ahN3NTETZI JOhHyMDsw==; Received: from [208.118.102.130] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fa0EG-0003iD-Tc; Mon, 02 Jul 2018 14:55:01 +0000 From: Christoph Hellwig To: "Darrick J. Wong" , linux-xfs@vger.kernel.org Cc: Andreas Gruenbacher , cluster-devel@redhat.com, linux-fsdevel@vger.kernel.org Subject: [PATCH 3/3] iomap: add inline data support to iomap_readpage_actor Date: Mon, 2 Jul 2018 08:54:58 -0600 Message-Id: <20180702145458.22330-4-hch@lst.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180702145458.22330-1-hch@lst.de> References: <20180702145458.22330-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andreas Gruenbacher Just copy the inline data into the page using the existing helper. Signed-off-by: Andreas Gruenbacher Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- fs/iomap.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/iomap.c b/fs/iomap.c index 98a1fdd5c091..13cdcf33e6c0 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -155,6 +155,12 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, bool is_contig = false; sector_t sector; + if (iomap->type == IOMAP_INLINE) { + WARN_ON_ONCE(poff); + iomap_read_inline_data(inode, page, iomap); + return PAGE_SIZE; + } + /* we don't support blocksize < PAGE_SIZE quite yet. */ WARN_ON_ONCE(pos != page_offset(page)); WARN_ON_ONCE(plen != PAGE_SIZE);