The patch titled
Subject: mm-swap-check-if-swap-backing-device-is-congested-or-not-fix
has been removed from the -mm tree. Its filename was
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix.patch
This patch was dropped because it was folded into mm-swap-check-if-swap-backing-device-is-congested-or-not.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-swap-check-if-swap-backing-device-is-congested-or-not-fix
Cc: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx>
Cc: Huang Ying <ying.huang@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Tim Chen <tim.c.chen@xxxxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx
Cc: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap_state.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/mm/swap_state.c~mm-swap-check-if-swap-backing-device-is-congested-or-not-fix
+++ a/mm/swap_state.c
@@ -538,14 +538,13 @@ struct page *swap_cluster_readahead(swp_
bool do_poll = true, page_allocated;
struct vm_area_struct *vma = vmf->vma;
unsigned long addr = vmf->address;
- struct inode *inode = NULL;
mask = swapin_nr_pages(offset) - 1;
if (!mask)
goto skip;
if (si->flags & (SWP_BLKDEV | SWP_FS)) {
- inode = si->swap_file->f_mapping->host;
+ struct inode *inode = si->swap_file->f_mapping->host;
if (inode_read_congested(inode))
goto skip;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-swap-check-if-swap-backing-device-is-congested-or-not.patch
mm-oom-remove-prefer-children-over-parent-heuristic-checkpatch-fixes.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis-fix.patch
