Re: unused 'size' assignment in filemap_nopage

[Jeff Moyer]

==> Regarding Re: unused 'size' assignment in filemap_nopage; Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> adds:

herbert> Jeff Moyer <jmoyer@xxxxxxxxxx> wrote:
>> After this, size is not referenced.  So, either this potential
>> reassignment of size is superfluous, or we are missing some other code
>> later on in the function.  If it is the former, I've attached a patch
>> which will remove the code.

herbert> Yes it's obsolete.  You can remove endoff as well.

Okay, here's the patch.

Thanks,

Jeff

--- linux-2.6.11/mm/filemap.c.orig	2005-03-23 08:32:38.182822976 -0500
+++ linux-2.6.11/mm/filemap.c	2005-03-23 08:33:34.966190592 -0500
@@ -1175,11 +1175,10 @@ struct page * filemap_nopage(struct vm_a
 	struct file_ra_state *ra = &file->f_ra;
 	struct inode *inode = mapping->host;
 	struct page *page;
-	unsigned long size, pgoff, endoff;
+	unsigned long size, pgoff;
 	int did_readaround = 0, majmin = VM_FAULT_MINOR;
 
 	pgoff = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) + area->vm_pgoff;
-	endoff = ((area->vm_end - area->vm_start) >> PAGE_CACHE_SHIFT) + area->vm_pgoff;
 
 retry_all:
 	size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
@@ -1191,13 +1190,6 @@ retry_all:
 		goto no_cached_page;
 
 	/*
-	 * The "size" of the file, as far as mmap is concerned, isn't bigger
-	 * than the mapping
-	 */
-	if (size > endoff)
-		size = endoff;
-
-	/*
 	 * The readahead code wants to be told about each and every page
 	 * so it can build and shrink its windows appropriately
 	 *
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/