mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeff Moyer <jmoyer@redhat.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-kernel@vger.kernel.org
Subject: Re: unused 'size' assignment in filemap_nopage
Date: Wed, 23 Mar 2005 08:44:19 -0500	[thread overview]
Message-ID: <16961.29363.691868.785104@segfault.boston.redhat.com> (raw)
In-Reply-To: <E1DE3jC-0001Lq-00@gondolin.me.apana.org.au>

==> Regarding Re: unused 'size' assignment in filemap_nopage; Herbert Xu <herbert@gondor.apana.org.au> adds:

herbert> Jeff Moyer <jmoyer@redhat.com> 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
 	 *

      reply	other threads:[~2005-03-23 13:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-03-22 21:52 Jeff Moyer
2005-03-23  6:53 ` Jan Engelhardt
2005-03-23 11:08 ` Herbert Xu
2005-03-23 13:44   ` Jeff Moyer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=16961.29363.691868.785104@segfault.boston.redhat.com \
    --to=jmoyer@redhat.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®