1 files changed, 9 insertions, 21 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 5209e47b7fe3..188cf5fd3e8d 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -28,6 +28,7 @@
 #include <linux/backing-dev.h>
 #include <linux/pagevec.h>
 #include <linux/blkdev.h>
+#include <linux/backing-dev.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/cpuset.h>
@@ -1299,7 +1300,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
         size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
         if (vmf->pgoff >= size)
-                goto outside_data_content;
+                return VM_FAULT_SIGBUS;
 
         /* If we don't want any read-ahead, don't bother */
         if (VM_RandomReadHint(vma))
@@ -1376,7 +1377,7 @@ retry_find:
         if (unlikely(vmf->pgoff >= size)) {
                 unlock_page(page);
                 page_cache_release(page);
-                goto outside_data_content;
+                return VM_FAULT_SIGBUS;
         }
 
         /*
@@ -1387,15 +1388,6 @@ retry_find:
         vmf->page = page;
         return ret | VM_FAULT_LOCKED;
 
-outside_data_content:
-        /*
-         * An external ptracer can access pages that normally aren't
-         * accessible..
-         */
-        if (vma->vm_mm == current->mm)
-                return VM_FAULT_SIGBUS;
-
-        /* Fall through to the non-read-ahead case */
 no_cached_page:
         /*
          * We're only likely to ever get here if MADV_RANDOM is in
@@ -2510,21 +2502,17 @@ generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
         }
 
         retval = mapping->a_ops->direct_IO(rw, iocb, iov, offset, nr_segs);
-        if (retval)
-                goto out;
 
         /*
          * Finally, try again to invalidate clean pages which might have been
-         * faulted in by get_user_pages() if the source of the write was an
-         * mmap()ed region of the file we're writing.  That's a pretty crazy
-         * thing to do, so we don't support it 100%.  If this invalidation
-         * fails and we have -EIOCBQUEUED we ignore the failure.
+         * cached by non-direct readahead, or faulted in by get_user_pages()
+         * if the source of the write was an mmap'ed region of the file
+         * we're writing.  Either one is a pretty crazy thing to do,
+         * so we don't support it 100%.  If this invalidation
+         * fails, tough, the write still worked...
          */
         if (rw == WRITE && mapping->nrpages) {
-                int err = invalidate_inode_pages2_range(mapping,
-                                              offset >> PAGE_CACHE_SHIFT, end);
-                if (err && retval >= 0)
-                        retval = err;
+                invalidate_inode_pages2_range(mapping, offset >> PAGE_CACHE_SHIFT, end);
         }
 out:
         return retval;