ufs: Remove checks for PageError

If read_mapping_page() encounters an error, it returns an errno, not
a page with PageError set, or a page that is not Uptodate, so this is
dead code.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index b721d0bda5e5d18f6d189c9ee035f9fdd28990ed..391efaf1d528975256d9ac4cd3230daaaebb4702 100644 (file)
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -193,7 +193,7 @@ static struct page *ufs_get_page(struct inode *dir, unsigned long n)
        if (!IS_ERR(page)) {
                kmap(page);
                if (unlikely(!PageChecked(page))) {
-                       if (PageError(page) || !ufs_check_page(page))
+                       if (!ufs_check_page(page))
                                goto fail;
                }
        }

diff --git a/fs/ufs/util.c b/fs/ufs/util.c
index 4fa633f842749d533b098420eb5dd9b6ba66e77c..08ddf41eaaadc75335fc2b9ee4a58240183e8f80 100644 (file)
--- a/fs/ufs/util.c
+++ b/fs/ufs/util.c
@@ -264,17 +264,6 @@ struct page *ufs_get_locked_page(struct address_space *mapping,
                        put_page(page);
                        return NULL;
                }
-
-               if (!PageUptodate(page) || PageError(page)) {
-                       unlock_page(page);
-                       put_page(page);
-
-                       printk(KERN_ERR "ufs_change_blocknr: "
-                              "can not read page: ino %lu, index: %lu\n",
-                              inode->i_ino, index);
-
-                       return ERR_PTR(-EIO);
-               }
        }
        if (!page_has_buffers(page))
                create_empty_buffers(page, 1 << inode->i_blkbits, 0);