From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>, Theodore Ts'o <tytso@mit•edu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jan Kara <jack@suse•cz>,
Matthew Wilcox <matthew.r.wilcox@intel•com>
Subject: linux-next: manual merge of the akpm-current tree with the ext4 tree
Date: Tue, 27 May 2014 18:09:43 +1000 [thread overview]
Message-ID: <20140527180943.5926e3d5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1490 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/ext4/page-io.c between commit a3f79014dc44 ("ext4: fix zeroing of
page during writeback") from the ext4 tree and commit 97527831700a
("fs/buffer.c: remove block_write_full_page_endio()") from the
akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/ext4/page-io.c
index b6a3804a9855,1a64e7a52b84..000000000000
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@@ -422,17 -418,6 +422,17 @@@ int ext4_bio_write_page(struct ext4_io_
ClearPageError(page);
/*
- * Comments copied from block_write_full_page_endio:
++ * Comments copied from block_write_full_page:
+ *
+ * The page straddles i_size. It must be zeroed out on each and every
+ * writepage invocation because it may be mmapped. "A file is mapped
+ * in multiples of the page size. For a file that is not a multiple of
+ * the page size, the remaining memory is zeroed when mapped, and
+ * writes to that region are not written out to the file."
+ */
+ if (len < PAGE_CACHE_SIZE)
+ zero_user_segment(page, len, PAGE_CACHE_SIZE);
+ /*
* In the first loop we prepare and mark buffers to submit. We have to
* mark all buffers in the page before submitting so that
* end_page_writeback() cannot be called from ext4_bio_end_io() when IO
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-27 8:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 8:09 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-02 7:43 linux-next: manual merge of the akpm-current tree with the ext4 tree Stephen Rothwell
2016-07-01 5:35 Stephen Rothwell
2013-08-19 7:06 Stephen Rothwell
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=20140527180943.5926e3d5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matthew.r.wilcox@intel$(echo .)com \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox