From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A72CC4338F for ; Tue, 10 Aug 2021 23:54:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23D5C60F55 for ; Tue, 10 Aug 2021 23:54:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235678AbhHJXyl (ORCPT ); Tue, 10 Aug 2021 19:54:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:58466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235508AbhHJXyl (ORCPT ); Tue, 10 Aug 2021 19:54:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BBDD960F38; Tue, 10 Aug 2021 23:54:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628639658; bh=BPt0XucTbKyfVVhoQUkTkClOhMOSHtA+n7pBWfaEhYI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=qHs07xlZQZtqy6QcOtbbm60f34RpL8z/+XGdFIVzXuwM28rb131GPDGMD9LHssYVw PyoGQpKaiKcs8fq8T4j4AyfWXtn/XuPbAbcZkl+pbXgz0dAotlkDJ0Ky0nr2PC1SLC H6HiQHaqVwrTItxCNqNFFkLMbO+6b/j/Nenm4TOU79K/iOo5oSbhiy3FembRJBC9j3 ScrHOqvvVEuZQ5NIuVqDKjGn59ue2kBcilGo4UA9mvrjZWzOHozFR/iz6u1j5dOfw2 1lu0zMxLrjX4Ryzx2JgAUAizt0Fsg5RXOUpNZEV7QppTzls4Lyvh1XDJI6WiBBlr2J FYG0++Kxv6pbg== Date: Tue, 10 Aug 2021 16:54:18 -0700 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Dan Williams , Matthew Wilcox , Andreas Gruenbacher , Shiyang Ruan , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, nvdimm@lists.linux.dev, cluster-devel@redhat.com Subject: Re: [PATCH 14/30] iomap: switch iomap_file_unshare to use iomap_iter Message-ID: <20210810235418.GM3601443@magnolia> References: <20210809061244.1196573-1-hch@lst.de> <20210809061244.1196573-15-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210809061244.1196573-15-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Mon, Aug 09, 2021 at 08:12:28AM +0200, Christoph Hellwig wrote: > Switch iomap_file_unshare to use iomap_iter. > > Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --D > --- > fs/iomap/buffered-io.c | 35 ++++++++++++++++++----------------- > 1 file changed, 18 insertions(+), 17 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 4c7e82928cc546..4f525727462f33 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -817,10 +817,12 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i, > } > EXPORT_SYMBOL_GPL(iomap_file_buffered_write); > > -static loff_t > -iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data, > - struct iomap *iomap, struct iomap *srcmap) > +static loff_t iomap_unshare_iter(struct iomap_iter *iter) > { > + struct iomap *iomap = &iter->iomap; > + struct iomap *srcmap = iomap_iter_srcmap(iter); > + loff_t pos = iter->pos; > + loff_t length = iomap_length(iter); > long status = 0; > loff_t written = 0; > > @@ -836,12 +838,12 @@ iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data, > unsigned long bytes = min_t(loff_t, PAGE_SIZE - offset, length); > struct page *page; > > - status = iomap_write_begin(inode, pos, bytes, > + status = iomap_write_begin(iter->inode, pos, bytes, > IOMAP_WRITE_F_UNSHARE, &page, iomap, srcmap); > if (unlikely(status)) > return status; > > - status = iomap_write_end(inode, pos, bytes, bytes, page, iomap, > + status = iomap_write_end(iter->inode, pos, bytes, bytes, page, iomap, > srcmap); > if (WARN_ON_ONCE(status == 0)) > return -EIO; > @@ -852,7 +854,7 @@ iomap_unshare_actor(struct inode *inode, loff_t pos, loff_t length, void *data, > written += status; > length -= status; > > - balance_dirty_pages_ratelimited(inode->i_mapping); > + balance_dirty_pages_ratelimited(iter->inode->i_mapping); > } while (length); > > return written; > @@ -862,18 +864,17 @@ int > iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, > const struct iomap_ops *ops) > { > - loff_t ret; > - > - while (len) { > - ret = iomap_apply(inode, pos, len, IOMAP_WRITE, ops, NULL, > - iomap_unshare_actor); > - if (ret <= 0) > - return ret; > - pos += ret; > - len -= ret; > - } > + struct iomap_iter iter = { > + .inode = inode, > + .pos = pos, > + .len = len, > + .flags = IOMAP_WRITE, > + }; > + int ret; > > - return 0; > + while ((ret = iomap_iter(&iter, ops)) > 0) > + iter.processed = iomap_unshare_iter(&iter); > + return ret; > } > EXPORT_SYMBOL_GPL(iomap_file_unshare); > > -- > 2.30.2 >