The patch titled
Subject: mm-swap-check-if-swap-backing-device-is-congested-or-not-fix-2
has been removed from the -mm tree. Its filename was
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix-2.patch
This patch was dropped because it was folded into mm-swap-check-if-swap-backing-device-is-congested-or-not.patch
------------------------------------------------------
From: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Subject: mm-swap-check-if-swap-backing-device-is-congested-or-not-fix-2
add comment
Link: http://lkml.kernel.org/r/bbc7bda7-62d0-df1a-23ef-d369e865bdca@xxxxxxxxxxxxxxxxx
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap_state.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/mm/swap_state.c~mm-swap-check-if-swap-backing-device-is-congested-or-not-fix-2
+++ a/mm/swap_state.c
@@ -543,7 +543,8 @@ struct page *swap_cluster_readahead(swp_
if (!mask)
goto skip;
- if (si->flags & (SWP_BLKDEV | SWP_FS)) {
+ /* Test swap type to make sure the dereference is safe */
+ if (likely(si->flags & (SWP_BLKDEV | SWP_FS))) {
struct inode *inode = si->swap_file->f_mapping->host;
if (inode_read_congested(inode))
goto skip;
_
Patches currently in -mm which might be from yang.shi@xxxxxxxxxxxxxxxxx are
mm-swap-check-if-swap-backing-device-is-congested-or-not.patch
mm-swap-add-comment-for-swap_vma_readahead.patch
mm-swap-use-mem_cgroup_is_root-instead-of-deferencing-css-parent.patch
mm-vmscan-do-not-iterate-all-mem-cgroups-for-global-direct-reclaim.patch
mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree.patch
