]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
zisofs: fix readpage() outside i_size
authorDave Young <hidave.darkstar@gmail.com>
Thu, 20 Mar 2008 02:45:04 +0000 (02:45 +0000)
committerChris Wright <chrisw@sous-sol.org>
Mon, 24 Mar 2008 18:48:02 +0000 (11:48 -0700)
commit: 08ca0db8aa2db4ddcf487d46d85dc8ffb22162cc

A read request outside i_size will be handled in do_generic_file_read().  So
we just return 0 to avoid getting -EIO as normal reading, let
do_generic_file_read do the rest.

At the same time we need unlock the page to avoid system stuck.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10227

Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Acked-by: Jan Kara <jack@suse.cz>
Report-by: Christian Perle <chris@linuxinfotag.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/isofs/compress.c

index 37dbd6404787b72c94513e66e7634166f2ebaa92..defb932eee9a9f45836ac2f62ee9dcf5f3838152 100644 (file)
@@ -72,6 +72,17 @@ static int zisofs_readpage(struct file *file, struct page *page)
        offset = index & ~zisofs_block_page_mask;
        blockindex = offset >> zisofs_block_page_shift;
        maxpage = (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+
+       /*
+        * If this page is wholly outside i_size we just return zero;
+        * do_generic_file_read() will handle this for us
+        */
+       if (page->index >= maxpage) {
+               SetPageUptodate(page);
+               unlock_page(page);
+               return 0;
+       }
+
        maxpage = min(zisofs_block_pages, maxpage-offset);
 
        for ( i = 0 ; i < maxpage ; i++, offset++ ) {