Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Huang Jianan <huangjianan@oppo.com>
To:     linux-f2fs-devel@lists.sourceforge.net
Cc:     huangjianan@oppo.com, guoweichao@oppo.com, zhangshiming@oppo.com,
        linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] f2fs: fix last_lblock check in check_swap_activate_fast
Date:   Sat, 27 Feb 2021 20:02:30 +0800
Message-Id: <20210227120231.136559-2-huangjianan@oppo.com>
In-Reply-To: <20210227120231.136559-1-huangjianan@oppo.com>
References: <20210227120231.136559-1-huangjianan@oppo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (58.252.5.72) by HK0PR01CA0050.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19 via Frontend Transport; Sat, 27 Feb 2021 12:02:49 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 0ab4be34-69c0-43cd-d950-08d8db179b14
X-MS-TrafficTypeDiagnostic: SG2PR02MB3369:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <SG2PR02MB3369B79840A89861709E1364C39C9@SG2PR02MB3369.apcprd02.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:826;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: aff3C5aNOowY6oLObFaaL9xgZVWUW7K2pzSdxc54GmuKdc3RejmJvi5g/jF6zOzBr3ge8NMyzXjzso5eH1TmJBrU8HDoLwtDMYDKTxXVDzyO/UusYmqF4jza9W9U1iaciuwk7CIk2AqdAEcvmnX9BF+3+ZgiPLI7Lqiqrjh/i+kM3/p5I/H4oeWhpbbGvnkoPe5ysUF5fFPgPg6UWOZdNnMYBWxjFWpAvLC39mIAMSkub2wLGFG2+0GPC3thjcb9oW0xGY8DnbtEsTXoUptYhobnwaa1acbxED4uNNB/hkVoyT1Exd/KJRIyrNoI1UU5RTSUGY05AXSjxP3ekeao7z6Z21FPUtG5cvlUtREbD9R7jXB7EM0+mu9dq9dj2fI+fNBRotfrG6l3/2nUpES4fuI+0RcY4VsL4gtbpFvq9H6+6C5KuOQpOX9M9nOBbjlBIplhNEOyE46sT1zG0lz3iDzRY6voaEAYFH/iV5ag27XmkbEZbvOZA7BCT2jIQ3+kZi9QQ1xgmwEyUch6yXzRZkSUTtcb95kocrfT9+iwMah/j+8asRHv6dBqznL8B9Dmnkg6CWW0IhCkWfLcsPjW8EVvYvAQzinstAuN4MQml3g=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SG2PR02MB4108.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39850400004)(346002)(136003)(396003)(366004)(376002)(66946007)(83380400001)(2616005)(86362001)(956004)(66556008)(316002)(4326008)(66476007)(52116002)(2906002)(8676002)(6512007)(16526019)(186003)(26005)(8936002)(69590400012)(36756003)(6666004)(478600001)(6916009)(6506007)(6486002)(1076003)(5660300002)(4744005)(11606007);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?HOWr131FlKrVoQxLg3bi48OHz0hlOEjMiBPnZ+rDDN1R7ATR6pjCS9g5j8Mf?=
 =?us-ascii?Q?MDhpml38IKje0qHSLQOzPsFRMGY+2Vl1Uzpb6VqywXxDlotdHVljXa4HzAx3?=
 =?us-ascii?Q?p5uomn96SUJtWq4sIci5wRIooNmUVEFGJHrhpFFOa+jybuJ6Np7mfj43jwbr?=
 =?us-ascii?Q?k9hrgyuEwoVtD79S1PdfLrGr8LG7WkN1UT9jfdPiQJa83Xc3zF+nNruxhDP6?=
 =?us-ascii?Q?YcDpFlHfuH0nur5oOIAU9lRlXqVmEIbnnLI2uboY6dinixlZePoVZhBxSnxK?=
 =?us-ascii?Q?KtnEfAZ1fl15hpfSzC14ITw700OkEJ2UDJRsL2zu+XIn3Zko/80UoLvwW8sP?=
 =?us-ascii?Q?ASOQ+4ETzC5XnTnynguP15tCW1pGLeE76zB7emIPtecXW9q+/rkFkmn3R2HW?=
 =?us-ascii?Q?3PaPVbu+3Jd1bjfjrZMDx+SThXNXLUBu/Kq2Iei5cEIsbIi3NMIAJuZX++Me?=
 =?us-ascii?Q?Z/90AqoNs3Q/D60QubLiTHEEFn6VEssiPKYCk036DWooXEgT0hHSxO+F6xdW?=
 =?us-ascii?Q?9TUw//T2ORLib5TMMqpwhBdZLR/I/SKQ4+QcXTWarJZxB562ed++rA4ejNqa?=
 =?us-ascii?Q?FWADEvIe08KRgc/DZ2/399nuwWknAhAJibvXNTBnyrc/HkH7pn79lPouI6N2?=
 =?us-ascii?Q?EU51XLXhWgegjFARnqQnDHIrPzayI+6tR+pnqPRx7Ixtwv9eZl3iw6+b6VPs?=
 =?us-ascii?Q?582s5kuwg2AOn94eDhTJrkBFnoqy4izS79a/NOG+/ry93ljN1rwwH3JZQ9dQ?=
 =?us-ascii?Q?PsrV/yCKcB3DpSbXKQdlljKDq9Wzph7NlRgU0aZ0rPo+suPg0P7ObBSIeHmh?=
 =?us-ascii?Q?/9C0KThQymrKOQ/ZvGMy34BGMYuHzqIcLoe5WfGQ268mJ9J0+hP8xNzYllZx?=
 =?us-ascii?Q?EliSkEV6e96c59WKwk0ui/wDwnEh+BvbNtVRCIqGYF52JYUF9oIePsrm02xI?=
 =?us-ascii?Q?zOdztItwfAWtJMTdB7pbUNiUW2M00RnjYv3/Pex0ugnAeY+Z1/+SuFtihyYR?=
 =?us-ascii?Q?8TmhNqYn6Vyr8SfYCQoKiJhjhKqVmUowk6Bzh/sKBYqaOyN5BYrXk4On90Iq?=
 =?us-ascii?Q?38ghXu5QwOuSVKaxhII+q8QXHXtPZlTsNaJUXpLu1bDsv6L9uqFS98iZhQDA?=
 =?us-ascii?Q?uBvqXeer01nAwK30YsVFxA04EUWbCO8MiREBleVubZkZQgURvy9cAC6Lzb8W?=
 =?us-ascii?Q?thSR6PQdNUdZzQ0v9lf5DHwNbXL6krS2aJ+RsvSoBJ19zFAoKtdrFt7MXMGI?=
 =?us-ascii?Q?iB+TBQn0M3qzmyR9olWav9fArk56L+sH6XJAPwD9AEKkEemQ4aH5uGarJLcz?=
 =?us-ascii?Q?FpzA90IriDWLHux+CJ9Zk3cK?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ab4be34-69c0-43cd-d950-08d8db179b14
X-MS-Exchange-CrossTenant-AuthSource: SG2PR02MB4108.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2021 12:02:50.7729
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: nerfKI0on9G7TuUmC5w4GGfUEfPSAkvyYXFFCaSw2kS1OViNVcasO6LYvKy7LazGk2X7L9xuiFDkTPKR6tVhuA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR02MB3369
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Because page_no < sis->max guarantees that the while loop break out 
normally, the wrong check contidion here doesn't cause a problem.

Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Signed-off-by: Guo Weichao <guoweichao@oppo.com>
---
 fs/f2fs/data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index a1498a1a345c..4dbc1cafc55d 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3804,7 +3804,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis,
 	last_lblock = bytes_to_blks(inode, i_size_read(inode));
 	len = i_size_read(inode);
 
-	while (cur_lblock <= last_lblock && cur_lblock < sis->max) {
+	while (cur_lblock + 1 <= last_lblock && cur_lblock < sis->max) {
 		struct f2fs_map_blocks map;
 		pgoff_t next_pgofs;
 
-- 
2.25.1