public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Matthew Wilcox <willy@infradead•org>
Cc: Christoph Hellwig <hch@lst•de>,
	Dan Williams <dan.j.williams@intel•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the folio-iomap tree with the nvdimm tree
Date: Fri, 24 Dec 2021 17:24:21 +1100	[thread overview]
Message-ID: <20211224172421.3f009baa@canb.auug.org.au> (raw)
In-Reply-To: <20211222211536.2fed6e78@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 2023 bytes --]

Hi all,

On Wed, 22 Dec 2021 21:15:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the folio-iomap tree got a conflict in:
> 
>   fs/iomap/buffered-io.c
> 
> between commit:
> 
>   de291b590286 ("iomap: turn the byte variable in iomap_zero_iter into a ssize_t")
> 
> from the nvdimm tree and commits:
> 
>   a25def1fe568 ("iomap: Convert __iomap_zero_iter to use a folio")
>   4d7bd0eb72e5 ("iomap: Inline __iomap_zero_iter into its caller")
> 
> from the folio-iomap tree.

Thanks to the addition of commit

  9e05e95ca8da ("iomap: Fix error handling in iomap_zero_iter()")

to the nvdimm tree, the resolutions is now as below.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/iomap/buffered-io.c
index d3b1169602fa,c6b3a148e898..000000000000
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@@ -888,19 -908,32 +907,23 @@@ static loff_t iomap_zero_iter(struct io
  		return length;
  
  	do {
- 		unsigned offset = offset_in_page(pos);
- 		ssize_t bytes = min_t(u64, PAGE_SIZE - offset, length);
- 		struct page *page;
+ 		struct folio *folio;
  		int status;
+ 		size_t offset;
+ 		size_t bytes = min_t(u64, SIZE_MAX, length);
  
- 		status = iomap_write_begin(iter, pos, bytes, &page);
 -		if (IS_DAX(iter->inode)) {
 -			s64 tmp = dax_iomap_zero(pos, bytes, iomap);
 -			if (tmp < 0)
 -				return tmp;
 -			bytes = tmp;
 -			goto good;
 -		}
 -
+ 		status = iomap_write_begin(iter, pos, bytes, &folio);
  		if (status)
  			return status;
  
- 		zero_user(page, offset, bytes);
- 		mark_page_accessed(page);
+ 		offset = offset_in_folio(folio, pos);
+ 		if (bytes > folio_size(folio) - offset)
+ 			bytes = folio_size(folio) - offset;
+ 
+ 		folio_zero_range(folio, offset, bytes);
+ 		folio_mark_accessed(folio);
  
- 		bytes = iomap_write_end(iter, pos, bytes, bytes, page);
+ 		bytes = iomap_write_end(iter, pos, bytes, bytes, folio);
 -good:
  		if (WARN_ON_ONCE(bytes == 0))
  			return -EIO;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

     prev parent reply	other threads:[~2021-12-24  6:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-22 10:15 linux-next: manual merge of the folio-iomap tree with the nvdimm tree Stephen Rothwell
2021-12-24  6:24 ` Stephen Rothwell [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211224172421.3f009baa@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=dan.j.williams@intel$(echo .)com \
    --cc=hch@lst$(echo .)de \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=willy@infradead$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox