From patchwork Tue Jun 12 17:59:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Jordan X-Patchwork-Id: 10460871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 43F9B601A0 for ; Tue, 12 Jun 2018 18:00:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 329E8288F6 for ; Tue, 12 Jun 2018 18:00:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2756428901; Tue, 12 Jun 2018 18:00:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99AD128906 for ; Tue, 12 Jun 2018 18:00:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7935F6B0005; Tue, 12 Jun 2018 14:00:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 741EE6B0006; Tue, 12 Jun 2018 14:00:02 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 631196B0007; Tue, 12 Jun 2018 14:00:02 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ua0-f199.google.com (mail-ua0-f199.google.com [209.85.217.199]) by kanga.kvack.org (Postfix) with ESMTP id 395306B0005 for ; Tue, 12 Jun 2018 14:00:02 -0400 (EDT) Received: by mail-ua0-f199.google.com with SMTP id n23-v6so6510503uao.15 for ; Tue, 12 Jun 2018 11:00:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=KSdKs3acEk+SOxMTWUF+oVzQ/Ni6BVNs7oqme0eMarE=; b=F4+keBXeer5OWb3jpnPfQqqaeyZTEgTuz+ok4FQ0SmazbXWSlpPGMKW4ifvV5WReSl dEUZSewceRrpvP05JD3yO2xYz1VSCGk+2Q8CPDauikPgETEhTW4df9KG+h10jcmEqkSt QHX7c9jSU4AdOFQV1ai06DZ1QKXbQbzsEd9MgnZYLPdpJTS7Qs1DC6lCguwZvQ0LhRuB zDRbTJZBAdTTC2paNibsbIIwHZnDlYEQCVwkO263EptRpFRrxaui79uUiHQp/jAi5gBY C1MUTRdGyP6SaLN7R6fH+KwlEyiwtg+5UGe8tkcApxE3FlHu92J4AxfeMGTceY+JcNAi 2QKg== X-Gm-Message-State: APt69E21VXVvU8go+85S+7BfX1fzG0vAqbAFKYnY5sU3xmZc83xYGRai dtHH1/s3BcKTRoJlcW4iurZmlGg6IkGMxA45N5HaRH9jdizwYPceBIy6/c/P57pav94mZ5CGLq5 iEKQDTntDha8acJMxrAEbu70is3Ynt7r0QWAYTFBxVSR+A8WzR+u9Rf44q4TGJfwsYg== X-Received: by 2002:a1f:93d0:: with SMTP id v199-v6mr955629vkd.124.1528826401856; Tue, 12 Jun 2018 11:00:01 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK6KY0lXKj6zHv+C10Ir8BOu2CzrVHw6RHkXEpgCvBO7xuWLngk5RFB1tAcYldAYf8i8FTC X-Received: by 2002:a1f:93d0:: with SMTP id v199-v6mr955605vkd.124.1528826401002; Tue, 12 Jun 2018 11:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528826400; cv=none; d=google.com; s=arc-20160816; b=kMfvrISFb+mIrKTaU8IjH7prV3H0m34gg0UEzveR/q32eKg83IX0bqLhYJ3t/M/G+V VRuRfZ0ZMzsBC7wOcjLFNT+r/RL4iqLQ9fSw6nNXC0PH31nr2W0OlqArCxpiZ16YebES KAU5XJ6nP1KqiWkVTSIeFgLUW9K0Ztv7t5Ne5gsiUN6AS1d1Snr9g0GxrrUOzGaxMMrk mDANIBAHnpVNlo0V9b8ynKyVQZ7H/VQtNIcBNgTRyTSk/JtxLYwf4XN4Ap5KG8sx4hbe abvRfBnSYcjqFtMOyH78wEiMD+4iZ1GhF5cDmOqIem0G6bgr/KAw0/ewWvV3aMBBNsyT Tedg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=KSdKs3acEk+SOxMTWUF+oVzQ/Ni6BVNs7oqme0eMarE=; b=lxFzgJPffE0eWYvpvG2LN32VsGER/l5Tty7m3Q2LdNIhpJ14zBmVy7v3CaVoQODX5P 0mVBq2SwA3dx1es88FE2oHxvWxuyey6wzRWFaPFWZk+akprEXZorNqFvDM4xmsmdrr/S JdIY4owAsL1Vvj30+Sz42kFRetW39meFlV/iwpAtVsYYduNIvnW03NauE/SNnXFx34As 1tarxuTu2l2X6JM/rHZU3FZUfb5oxAZa3x1PfC1ZR/q0/y14XFtKGdEHfmKdz6jfObq6 D1yr1QlH3FySQxo9Xp1dDBkYtgza2z5oaTSRxSicgrOZMqrw2ftI+kLxYFm9MHioPMTJ ecUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=ouVSw+kN; spf=pass (google.com: domain of daniel.m.jordan@oracle.com designates 156.151.31.86 as permitted sender) smtp.mailfrom=daniel.m.jordan@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2130.oracle.com (userp2130.oracle.com. [156.151.31.86]) by mx.google.com with ESMTPS id x4-v6si234713uan.57.2018.06.12.11.00.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 11:00:00 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.m.jordan@oracle.com designates 156.151.31.86 as permitted sender) client-ip=156.151.31.86; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=ouVSw+kN; spf=pass (google.com: domain of daniel.m.jordan@oracle.com designates 156.151.31.86 as permitted sender) smtp.mailfrom=daniel.m.jordan@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5CHvTgl080387; Tue, 12 Jun 2018 17:59:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2017-10-26; bh=KSdKs3acEk+SOxMTWUF+oVzQ/Ni6BVNs7oqme0eMarE=; b=ouVSw+kNnoYuKePEVGZjfydu2Y3YJv6hIlem8lurbVGGFe6ufLRAREWe2shEHhZ/X5uZ AmeOfYnbz+7NNIKPz30/BMNcc2sBr2gwsp60jEVo6Y7v5+hibdJqY0SWcHnMLWzR7zFd gxQGe4NsAWoD5X6ujiIx3BqJqzLwu6bytXcfisVBtSFNXf5Js1XmDiORt31NWWC/FE5z a3QQeYNR7zMs4SwoY673ThTkNHrkUU2wJi3GHqv8v9180zvypDFrkmkh+pMJbWxWiOOn EDcpCrOZD0/FLVU1GlPhUNRaZ5wnjdaU1Cb2wPxQLbToCo5ze7wRCrEE/WbaE3Dt0I5x Lw== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2jg6b1k68p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Jun 2018 17:59:57 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w5CHxuTj027082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Jun 2018 17:59:56 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w5CHxu4i029558; Tue, 12 Jun 2018 17:59:56 GMT Received: from zissou.us.oracle.com (/10.152.34.32) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 12 Jun 2018 10:59:55 -0700 From: Daniel Jordan To: akpm@linux-foundation.org Cc: ying.huang@intel.com, hughd@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, daniel.m.jordan@oracle.com Subject: [PATCH] mm, swap: fix swap_count comment about nonexistent SWAP_HAS_CONT Date: Tue, 12 Jun 2018 13:59:19 -0400 Message-Id: <20180612175919.30413-1-daniel.m.jordan@oracle.com> X-Mailer: git-send-email 2.17.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8922 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=820 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806120201 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: X-Virus-Scanned: ClamAV using ClamSMTP 570a335b8e22 ("swap_info: swap count continuations") introduces COUNT_CONTINUED but refers to it incorrectly as SWAP_HAS_CONT in a comment in swap_count. Fix it. Fixes: 570a335b8e22 ("swap_info: swap count continuations") Signed-off-by: Daniel Jordan Cc: "Huang, Ying" Cc: Hugh Dickins --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 744d66666f82..808349ee6f6f 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -101,7 +101,7 @@ atomic_t nr_rotate_swap = ATOMIC_INIT(0); static inline unsigned char swap_count(unsigned char ent) { - return ent & ~SWAP_HAS_CACHE; /* may include SWAP_HAS_CONT flag */ + return ent & ~SWAP_HAS_CACHE; /* may include COUNT_CONTINUED flag */ } /* returns 1 if swap entry is freed */