Merge branches 'release' and 'autoload' into release

[sfrench/cifs-2.6.git] / fs / ntfs / aops.h

diff --git a/fs/ntfs/aops.h b/fs/ntfs/aops.h
index 9393f4b1e298faa9d84d2f6dcb3b771a8be7d4b0..caecc58f529c90e06f55bb5415fbe19b0995dac3 100644 (file)
--- a/fs/ntfs/aops.h
+++ b/fs/ntfs/aops.h
@@ -89,9 +89,8 @@ static inline struct page *ntfs_map_page(struct address_space *mapping,
        struct page *page = read_mapping_page(mapping, index, NULL);
 
        if (!IS_ERR(page)) {
-               wait_on_page_locked(page);
                kmap(page);
-               if (PageUptodate(page) && !PageError(page))
+               if (!PageError(page))
                        return page;
                ntfs_unmap_page(page);
                return ERR_PTR(-EIO);