Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99e3e53f authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm: cleanup size checks in filemap_fault() and filemap_map_pages() 



Minor cleanups:
 - 'size' variable is now in bytes, not pages;
 - use round_up(): it should be easier to read.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Ning Qu <quning@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f1820361

mm/filemap.c

+7 −7
Original line number Diff line number Diff line
@@ -1953,11 +1953,11 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	struct inode *inode = mapping->host;

	pgoff_t offset = vmf->pgoff;

	struct page *page;

	pgoff_t size;

	loff_t size;

	int ret = 0;



	size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;

	if (offset >= size)

	size = round_up(i_size_read(inode), PAGE_CACHE_SIZE);

	if (offset >= size >> PAGE_CACHE_SHIFT)

		return VM_FAULT_SIGBUS;



	/*
@@ -2006,8 +2006,8 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	 * Found the page and have a reference on it.

	 * We must recheck i_size under page lock.

	 */

	size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;

	if (unlikely(offset >= size)) {

	size = round_up(i_size_read(inode), PAGE_CACHE_SIZE);

	if (unlikely(offset >= size >> PAGE_CACHE_SHIFT)) {

		unlock_page(page);

		page_cache_release(page);

		return VM_FAULT_SIGBUS;
@@ -2111,7 +2111,7 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf) 
		if (page->mapping != mapping || !PageUptodate(page))

			goto unlock;



		size = i_size_read(mapping->host) + PAGE_CACHE_SIZE - 1;

		size = round_up(i_size_read(mapping->host), PAGE_CACHE_SIZE);

		if (page->index >= size >> PAGE_CACHE_SHIFT)

			goto unlock;