The patch titled
reiser4: fix readpage_unix_file
has been removed from the -mm tree. Its filename was
reiser4-fix-readpage_unix_file.patch
This patch was dropped because it was folded into reiser4.patch
------------------------------------------------------
Subject: reiser4: fix readpage_unix_file
From: Edward Shishkin <edward@xxxxxxxxxxx>
. If nominated (by VFS) page is out of file size, then fill it
by zeros instead of returning -EINVAL (this prevents returning
an unexpected error (-EINVAL) by some apps that don't check
file size).
. Check if the page became uptodate while it was being unlocked.
Signed-off-by: Edward Shishkin <edward@xxxxxxxxxxx>
Cc: Zan Lynx <zlynx@xxxxxxx>
Cc: "Vladimir V. Saveliev" <vs@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/reiser4/plugin/file/file.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff -puN fs/reiser4/plugin/file/file.c~reiser4-fix-readpage_unix_file fs/reiser4/plugin/file/file.c
--- a/fs/reiser4/plugin/file/file.c~reiser4-fix-readpage_unix_file
+++ a/fs/reiser4/plugin/file/file.c
@@ -1436,9 +1436,11 @@ int readpage_unix_file(struct file *file
assert("vs-1061", page->mapping && page->mapping->host);
if (page->mapping->host->i_size <= page_offset(page)) {
- /* page is out of file already */
+ /* page is out of file */
+ zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+ SetPageUptodate(page);
unlock_page(page);
- return -EINVAL;
+ return 0;
}
inode = page->mapping->host;
@@ -1625,6 +1627,8 @@ static int uf_readpages_filler(void * da
if (unlikely(ret))
goto exit;
lock_page(page);
+ if (PageUptodate(page))
+ goto unlock;
cbk_done = 1;
}
ret = zload(rc->coord.node);
_
Patches currently in -mm which might be from edward@xxxxxxxxxxx are
origin.patch
reiser4.patch
reiser4-fix-readpage_unix_file.patch
reiser4-fix-for-new-aops-patches.patch
reiser4-do-not-allocate-struct-file-on-stack.patch
git-block-vs-reiser4.patch
reiser4-cryptcompress-misc-fixups.patch
reiser4-cryptcompress-misc-fixups-2.patch
reiser4-cryptcompress-misc-fixups-make-3-functions-static.patch
reiser4-change-error-code-base.patch
reiser4-use-lzo-library-functions.patch
fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc.patch
reiser4-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-init_superc-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-ktxnmgrdc-kmalloc-memset-conversion-to-kzalloc.patch
git-nfsd-broke-reiser4.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
