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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 E3B6BC56202 for ; Thu, 26 Nov 2020 02:24:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B2982075A for ; Thu, 26 Nov 2020 02:24:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="pbWylj94" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733267AbgKZCYW (ORCPT ); Wed, 25 Nov 2020 21:24:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:33582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733228AbgKZCYT (ORCPT ); Wed, 25 Nov 2020 21:24:19 -0500 Received: from localhost (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2850C2075A; Thu, 26 Nov 2020 02:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606357459; bh=6XA/qLOngyDBniW52sdY2h+RkRTLQMuD9eGtpZ7QD58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pbWylj94aEe5yLGR1ytq1uLUyNwVrbA9vB/J/Nt7E70LoOQH4/TMN6rl25PXXXzT3 LdzIU/Ml62KHkIhD3lRC/bJodgO7q2745ImC/PZjC9fdhXvhuy6EHZet/ijaK3fnJy 8c83CHjtZIXBZE9z6wZBHG2736slW+Strzin8thQ= From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, kernel-team@android.com Cc: Jaegeuk Kim Subject: [PATCH 3/4] f2fs: fix wrong block count instead of bytes Date: Wed, 25 Nov 2020 18:24:15 -0800 Message-Id: <20201126022416.3068426-3-jaegeuk@kernel.org> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog In-Reply-To: <20201126022416.3068426-1-jaegeuk@kernel.org> References: <20201126022416.3068426-1-jaegeuk@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We should convert cur_lblock, a block count, to bytes for len. Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index a84e5bc09337..e49c14ccfafe 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -3893,7 +3893,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, sector_t highest_pblock = 0; int nr_extents = 0; unsigned long nr_pblocks; - unsigned long len; + u64 len; int ret; /* @@ -3911,7 +3911,7 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, cond_resched(); memset(&map_bh, 0, sizeof(struct buffer_head)); - map_bh.b_size = len - cur_lblock; + map_bh.b_size = len - blks_to_bytes(inode, cur_lblock); ret = get_data_block(inode, cur_lblock, &map_bh, 0, F2FS_GET_BLOCK_FIEMAP, &next_pgofs); -- 2.29.2.454.gaff20da3a2-goog