From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83988C4338F for ; Tue, 10 Aug 2021 20:29:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2108661008 for ; Tue, 10 Aug 2021 20:29:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2108661008 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 7FDDA8D0002; Tue, 10 Aug 2021 16:29:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7AE176B0072; Tue, 10 Aug 2021 16:29:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69D0F8D0002; Tue, 10 Aug 2021 16:29:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 50B356B0071 for ; Tue, 10 Aug 2021 16:29:41 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F2A738249980 for ; Tue, 10 Aug 2021 20:29:40 +0000 (UTC) X-FDA: 78460311720.20.3343EF4 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf17.hostedemail.com (Postfix) with ESMTP id BAC14F002C9D for ; Tue, 10 Aug 2021 20:29:40 +0000 (UTC) Received: by mail-pj1-f50.google.com with SMTP id a8so34782980pjk.4 for ; Tue, 10 Aug 2021 13:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k9wsqN7YVW74vSpW7e/ejgv7USagZP+TqAT+Y6PYQHY=; b=uLhHC4BB4SdqtXeV4nk8oKb2M/EPPK+qS0dWpRp1kk8U+pDB1fzViuhbYBGl3IX04c gtPHvtptqrK6J1ZXgpQh9WH3ir8YRql+k03hsoNTHj1SEAw0C4/6pzKFAeWFP3b1r0GA P0Grgo6j3P7CmVX6kvog4SK9BjzJy0pEMl9TwdeWD3QHp+/kCX1L5kISAFr9zJxC/5xR ajGXf1Iuln/CQyv05+fsCUW35yL/LoLBG07ZDDRHsfjIduPCX9nHQk/USlk03l2caAnE zCjEzY7t7a3Q92c40EfqGSQTy1R+b/fSEiD8i1+J86gYA0ep0cGCCM99NM2RCdXtQgoq 1MwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k9wsqN7YVW74vSpW7e/ejgv7USagZP+TqAT+Y6PYQHY=; b=eDslsBSlOjB+OSNeZzRImJsZj24Zerf/ZAQ/Jjje1f9b5nu+vZPA1h1lHdajDg1Em5 sDFehfzjD1TF8pDZOu4/ez91riNeKiKK059wpNhEgxURKIViU9u4FTS81+JKEzpY10WA chqDvryRddiKQt+iY/U3bEEnQsnAes7vnvJSi7KJ2ZXHjsFHichjYqyShK88h1Ds8ZSr EHzf5bn86lnVkMPifuB8ViFzvB3sJrzK6lq6GwRE5w7vVRfVYxqheFE7vVcItefx+HsC BVtM6A8dyhME/OgB7i2sAI7+PFWgmyysZfyr7x9MMFdg7kHziNYrlUxxSDeeD0gtNih/ pMwA== X-Gm-Message-State: AOAM5318WdT/9HcGUJY35HSu3JpEfDb2/usyf8geFS0r6oP6Kuu4iwtS DbiyLBMDpu2v2WTt3UEfQWs= X-Google-Smtp-Source: ABdhPJwRkFSelQQu1jRuLdTr7MZ+iU84dCdmsYiR/77wsHUICwrhjerxSHAZmBvF1ZtDjbvnPqX6lw== X-Received: by 2002:aa7:9254:0:b029:3c9:268e:ae68 with SMTP id 20-20020aa792540000b02903c9268eae68mr19345505pfp.58.1628627379720; Tue, 10 Aug 2021 13:29:39 -0700 (PDT) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id e12sm24697145pfc.214.2021.08.10.13.29.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 13:29:38 -0700 (PDT) From: Yang Shi To: hughd@google.com, ying.huang@intel.com, linmiaohe@huawei.com, Andrew Morton Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3 linux-next] Revert "mm,shmem: fix a typo in shmem_swapin_page()" Date: Tue, 10 Aug 2021 13:29:34 -0700 Message-Id: <20210810202936.2672-1-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: BAC14F002C9D Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=uLhHC4BB; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.50 as permitted sender) smtp.mailfrom=shy828301@gmail.com X-Stat-Signature: xuoaq6ftgj83ytzwrnino6ptsfp3a17m X-HE-Tag: 1628627380-589333 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Due to the change about how block layer detects congestion the justification of commit 8fd2e0b505d1 ("mm: swap: check if swap backing de= vice 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 Cc: "Huang, Ying" Cc: Miaohe Lin Signed-off-by: Yang Shi --- 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, p= goff_t index, /* Prevent swapoff from happening to us. */ si =3D get_swap_device(swap); if (!si) { - error =3D -EINVAL; + error =3D EINVAL; goto failed; } /* Look it up and read it in.. */ --=20 2.26.2