This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / mm / fremap.c

diff --git a/mm/fremap.c b/mm/fremap.c
index 2f211f5..e9282de 100644 (file)
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -57,8 +57,6 @@ static inline void zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
                unsigned long addr, struct page *page, pgprot_t prot)
 {
-       struct inode *inode;
-       pgoff_t size;
        int err = -ENOMEM;
        pte_t *pte;
        pgd_t *pgd;
@@ -79,16 +77,6 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
        if (!pte)
                goto err_unlock;
 
-       /*
-        * This page may have been truncated. Tell the
-        * caller about it.
-        */
-       err = -EINVAL;
-       inode = vma->vm_file->f_mapping->host;
-       size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-       if (!page->mapping || page->index >= size)
-               goto err_unlock;
-
        zap_pte(mm, vma, addr, pte);
 
        // mm->rss++;
@@ -206,8 +194,7 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
         * or VM_LOCKED, but VM_LOCKED could be revoked later on).
         */
        if (vma && (vma->vm_flags & VM_SHARED) &&
-               (!vma->vm_private_data ||
-                       (vma->vm_flags & (VM_NONLINEAR|VM_RESERVED))) &&
+               (!vma->vm_private_data || (vma->vm_flags & VM_RESERVED)) &&
                vma->vm_ops && vma->vm_ops->populate &&
                        end > start && start >= vma->vm_start &&
                                end <= vma->vm_end) {