aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Baron <jbaron@redhat.com>2007-07-16 02:38:21 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:36 -0400
commitf7977793240d836e60ff413e94e6914f08e10941 (patch)
tree75955844a77b70c02aa44982d27ca17ceb702cf3
parent897e679b17460b52752a038af29db356fe1bd759 (diff)
speed up madvise_need_mmap_write() usage
In the new madvise_need_mmap_write() call we can avoid an extra case statement and function call as follows. Signed-off-by: Jason Baron <jbaron@redhat.com> Cc: Nishanth Aravamudan <nacc@us.ibm.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/madvise.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/madvise.c b/mm/madvise.c
index 60542d006ec..93ee375b38e 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -287,9 +287,11 @@ asmlinkage long sys_madvise(unsigned long start, size_t len_in, int behavior)
287 struct vm_area_struct * vma, *prev; 287 struct vm_area_struct * vma, *prev;
288 int unmapped_error = 0; 288 int unmapped_error = 0;
289 int error = -EINVAL; 289 int error = -EINVAL;
290 int write;
290 size_t len; 291 size_t len;
291 292
292 if (madvise_need_mmap_write(behavior)) 293 write = madvise_need_mmap_write(behavior);
294 if (write)
293 down_write(&current->mm->mmap_sem); 295 down_write(&current->mm->mmap_sem);
294 else 296 else
295 down_read(&current->mm->mmap_sem); 297 down_read(&current->mm->mmap_sem);
@@ -354,7 +356,7 @@ asmlinkage long sys_madvise(unsigned long start, size_t len_in, int behavior)
354 vma = find_vma(current->mm, start); 356 vma = find_vma(current->mm, start);
355 } 357 }
356out: 358out:
357 if (madvise_need_mmap_write(behavior)) 359 if (write)
358 up_write(&current->mm->mmap_sem); 360 up_write(&current->mm->mmap_sem);
359 else 361 else
360 up_read(&current->mm->mmap_sem); 362 up_read(&current->mm->mmap_sem);