git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix checks for expand-in-place mremap
[safe/jmp/linux-2.6]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index
60ea601
..
6ab19dd
100644
(file)
--- a/
mm/memory.c
+++ b/
mm/memory.c
@@
-2542,7
+2542,7
@@
static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
} else if (PageHWPoison(page)) {
ret = VM_FAULT_HWPOISON;
delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
} else if (PageHWPoison(page)) {
ret = VM_FAULT_HWPOISON;
delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
- goto out;
+ goto out
_release
;
}
lock_page(page);
}
lock_page(page);
@@
-2614,6
+2614,7
@@
out_nomap:
pte_unmap_unlock(page_table, ptl);
out_page:
unlock_page(page);
pte_unmap_unlock(page_table, ptl);
out_page:
unlock_page(page);
+out_release:
page_cache_release(page);
return ret;
}
page_cache_release(page);
return ret;
}