]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
remove detritus left by "mm: make read_cache_page synchronous"
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 28 May 2010 15:34:50 +0000 (11:34 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 28 May 2010 15:37:41 +0000 (11:37 -0400)
gets minix get_dir_page() in sync with its analogs; back in 2007
Nick has switched read_cache_page() and friends to sync behaviour
(i.e.  they wait for the page to get unlocked, check if it's uptodate
and if it isn't return ERR_PTR(-EIO) instead) and removed the
duplicate logics from the callers.  In case of fs/minix/dir.c he'd
removed only half of that...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/minix/dir.c

index aaab97ec5bc0040e4bd71f74a469fd2e2821c390..91969589131c562d0dfaddc4d3f1905611262a23 100644 (file)
@@ -72,11 +72,8 @@ static struct page * dir_get_page(struct inode *dir, unsigned long n)
 {
        struct address_space *mapping = dir->i_mapping;
        struct page *page = read_mapping_page(mapping, n, NULL);
-       if (!IS_ERR(page)) {
+       if (!IS_ERR(page))
                kmap(page);
-               if (!PageUptodate(page))
-                       goto fail;
-       }
        return page;
 
 fail: