The patch titled
Subject: ksm: unstable_tree_search_insert error checking cleanup
has been added to the -mm tree. Its filename is
ksm-unstable_tree_search_insert-error-checking-cleanup.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ksm-unstable_tree_search_insert-error-checking-cleanup.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ksm-unstable_tree_search_insert-error-checking-cleanup.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Subject: ksm: unstable_tree_search_insert error checking cleanup
get_mergeable_page() can only return NULL (in case of errors) or the
pinned mergeable page. It can't return an error different than NULL.
This makes it more readable and less confusion in addition to optimizing
the check.
Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Petr Holasek <pholasek@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/ksm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/ksm.c~ksm-unstable_tree_search_insert-error-checking-cleanup mm/ksm.c
--- a/mm/ksm.c~ksm-unstable_tree_search_insert-error-checking-cleanup
+++ a/mm/ksm.c
@@ -1409,7 +1409,7 @@ struct rmap_item *unstable_tree_search_i
cond_resched();
tree_rmap_item = rb_entry(*new, struct rmap_item, node);
tree_page = get_mergeable_page(tree_rmap_item);
- if (IS_ERR_OR_NULL(tree_page))
+ if (!tree_page)
return NULL;
/*
_
Patches currently in -mm which might be from aarcange@xxxxxxxxxx are
ksm-fix-rmap_item-anon_vma-memory-corruption-and-vma-user-after-free.patch
ksm-add-cond_resched-to-the-rmap_walks.patch
ksm-dont-fail-stable-tree-lookups-if-walking-over-stale-stable_nodes.patch
ksm-use-the-helper-method-to-do-the-hlist_empty-check.patch
ksm-use-find_mergeable_vma-in-try_to_merge_with_ksm_page.patch
ksm-unstable_tree_search_insert-error-checking-cleanup.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
