The patch titled
valid_swaphandles() fix
has been added to the -mm tree. Its filename is
valid_swaphandles-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: valid_swaphandles() fix
From: Hugh Dickins <hugh@xxxxxxxxxxx>
akpm draws my attention to the fact that sysctl(VM_PAGE_CLUSTER) might
conceivably change page_cluster to 0 while valid_swaphandles() is in the
middle of using it, leading to an embarrassingly long loop: take a local
snapshot of page_cluster and work with that.
Signed-off-by: Hugh Dickins <hugh@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/swapfile.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff -puN mm/swapfile.c~valid_swaphandles-fix mm/swapfile.c
--- a/mm/swapfile.c~valid_swaphandles-fix
+++ a/mm/swapfile.c
@@ -1723,13 +1723,14 @@ get_swap_info_struct(unsigned type)
*/
int valid_swaphandles(swp_entry_t entry, unsigned long *offset)
{
- int ret = 0, i = 1 << page_cluster;
+ int our_page_cluster = page_cluster;
+ int ret = 0, i = 1 << our_page_cluster;
unsigned long toff;
struct swap_info_struct *swapdev = swp_type(entry) + swap_info;
- if (!page_cluster) /* no readahead */
+ if (!our_page_cluster) /* no readahead */
return 0;
- toff = (swp_offset(entry) >> page_cluster) << page_cluster;
+ toff = (swp_offset(entry) >> our_page_cluster) << our_page_cluster;
if (!toff) /* first page is swap header */
toff++, i--;
*offset = toff;
_
Patches currently in -mm which might be from hugh@xxxxxxxxxxx are
git-agpgart.patch
mm-vm_bug_on.patch
mm-tracking-shared-dirty-pages.patch
mm-balance-dirty-pages.patch
mm-optimize-the-new-mprotect-code-a-bit.patch
mm-small-cleanup-of-install_page.patch
mm-fixup-do_wp_page.patch
mm-msync-cleanup.patch
mm-tracking-shared-dirty-pages-wimp.patch
mm-remove_mapping-safeness.patch
mm-remove_mapping-safeness-fix.patch
mm-swap-write-failure-fixup.patch
mm-swap-write-failure-fixup-fix.patch
standardize-pxx_page-macros.patch
make-prot_write-imply-prot_read.patch
valid_swaphandles-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
