[PATCH 1/3 linux-next] Revert "mm,shmem: fix a typo in shmem_swapin_page()"
From: Yang Shi
Date: Tue Aug 10 2021 - 16:29:44 EST
Due to the change about how block layer detects congestion the
justification of commit 8fd2e0b505d1 ("mm: swap: check if swap backing device
is congested or not") doesn't stand anymore, so the commit could be just
reverted in order to solve the race reported by commit 2efa33fc7f6e ("mm/shmem:
fix shmem_swapin() race with swapoff"), so the fix commit and this fix's fix
commit could be reverted as well.
Suggested-by: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Signed-off-by: Yang Shi <shy828301@xxxxxxxxx>
---
This revert is for linux-next/-mm tree only since this commit has not
merged into Linus's tree yet.
mm/shmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 1bea7f50825b..dcc07d14162e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1711,7 +1711,7 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,
/* Prevent swapoff from happening to us. */
si = get_swap_device(swap);
if (!si) {
- error = -EINVAL;
+ error = EINVAL;
goto failed;
}
/* Look it up and read it in.. */
--
2.26.2