linux-kernel - [PATCH 1/3 linux-next] Revert "mm,shmem: fix a typo in shmem_swapin

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 10 Aug 2021 13:29:34 -0700
From:   Yang Shi <shy828301@...il.com>
To:     hughd@...gle.com, ying.huang@...el.com, linmiaohe@...wei.com,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     shy828301@...il.com, linux-mm@...ck.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH 1/3 linux-next] Revert "mm,shmem: fix a typo in shmem_swapin_page()"

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@...gle.com>
Cc: "Huang, Ying" <ying.huang@...el.com>
Cc: Miaohe Lin <linmiaohe@...wei.com>
Signed-off-by: Yang Shi <shy828301@...il.com>
---
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