From patchwork Sat Mar 28 06:05:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 11463415 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 87CDC81 for ; Sat, 28 Mar 2020 06:06:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 547D3206F2 for ; Sat, 28 Mar 2020 06:06:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kv9L3cKq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 547D3206F2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 94A596B0032; Sat, 28 Mar 2020 02:06:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8D3A56B0036; Sat, 28 Mar 2020 02:06:12 -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 723696B0037; Sat, 28 Mar 2020 02:06:12 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id 5AE6A6B0032 for ; Sat, 28 Mar 2020 02:06:12 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 25FDF582D for ; Sat, 28 Mar 2020 06:06:12 +0000 (UTC) X-FDA: 76643735784.14.place09_53391dad89d41 X-Spam-Summary: 2,0,0,0dc8a0036c0afbaa,d41d8cd98f00b204,richard.weiyang@gmail.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1345:1359:1437:1534:1540:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3868:3870:3871:4321:5007:6119:6261:6653:7514:7558:8540:9413:10004:11026:11658:11914:12297:12517:12519:12555:12895:13069:13146:13230:13311:13357:14181:14384:14394:14687:14721:21080:21444:21451:21627:21666:21990:30012:30054,0,RBL:209.85.221.66:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: place09_53391dad89d41 X-Filterd-Recvd-Size: 3640 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Mar 2020 06:06:11 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id 31so14323968wrs.3 for ; Fri, 27 Mar 2020 23:06:11 -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:in-reply-to:references; bh=WtlQPkdICdSif60EiclWGWU5XZBZP+qLNsbVEnNZNqA=; b=Kv9L3cKqFvmEx2bcOl2zy+8nyIsg18Cn4Gv2VNxdcuX3P2x0xh2EWcGYMXgbe26TNf LqipxAyjmPC18C7Zxs/jnb+k+EINirBcxEoFq7Zfk6BbK0qdArjM6V+jiVSt9F4IoaGK FHRlqyXJGvN1zUDY7DPKLrfC4u3/h1G63SehM4kfjqfC/Dc4Z0prJdQA4pRLQxQ4QpEn Cl9CXW3tXWgUcJVzrpG0rjWlbLOFF4JHAREVxWz8Rh5sqKGkC8IM/TtkRCVwanNVz0I3 Vrs49MQK69nrpjctnWPbBeP1pWkMNjZgZ2qOtOMUOHZBTgZRu9b+u8s9IoGRdJvV/vEH YWTQ== 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:in-reply-to :references; bh=WtlQPkdICdSif60EiclWGWU5XZBZP+qLNsbVEnNZNqA=; b=K762TXNSxNDdKoolXIIkX3ETFZgxTKc9MRdFwKTapwV3JI11TXOmoQBOIFKauwsywr 0EWHJTmAQe9thZcZF15skGx/oo6nPYM6aGAmArKeoVfDUoHydWsRyVVo1j2a6ArsVCwz oT6+rMIZt+puaCwg1iEOaACXA33Qnu5cr6PQFwb4ZptnEPVRDTJsB1IQWv/14UTgZ7Ob FbRZ5j2pxV2BUh3WIyh31XaIU1OEDMmXuzhTNikWTy1qI22yly3x2TIjVEXrk7nVTCA9 7ofgoBjFkQjCbNe6XUX6PW+Lbfqo0Kxr5AZptBMphpYjD68cxRiqcf349kvOS8gOQWMc GTnA== X-Gm-Message-State: ANhLgQ0Yjaem7nNikyh4eIMZr23wRgp6kp8P09z9oUJkQoY0YQtpF1Js FQwpo0l8zlc2oI/slj8V4Eg= X-Google-Smtp-Source: ADFU+vtc/KFk/g8A31nX3lHxrJRjKhryKYhbhqJkJetNubeeO+aN4etZLQPF1fBp4kmLr/8C6l3C3Q== X-Received: by 2002:a5d:464e:: with SMTP id j14mr3219727wrs.339.1585375570783; Fri, 27 Mar 2020 23:06:10 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id w204sm11264719wma.1.2020.03.27.23.06.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 23:06:10 -0700 (PDT) From: Wei Yang To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH 1/3] mm/swapfile.c: offset is only used when there is more slots Date: Sat, 28 Mar 2020 06:05:18 +0000 Message-Id: <20200328060520.31449-2-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200328060520.31449-1-richard.weiyang@gmail.com> References: <20200328060520.31449-1-richard.weiyang@gmail.com> 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: When si->cluster_nr is zero, function would reach done and return. The increased offset would not be used any more. This means we can move the offset increment into the if clause. This brings a further code cleanup possibility. Signed-off-by: Wei Yang --- mm/swapfile.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 6b6e41967bf3..52afb74fc3d1 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -871,11 +871,9 @@ static int scan_swap_map_slots(struct swap_info_struct *si, else goto done; } - /* non-ssd case */ - ++offset; /* non-ssd case, still more slots in cluster? */ - if (si->cluster_nr && !si->swap_map[offset]) { + if (si->cluster_nr && !si->swap_map[++offset]) { --si->cluster_nr; goto checks; }