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=-16.4 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,URIBL_BLOCKED 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 78120C4708C for ; Thu, 27 May 2021 01:40:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 559CB613D4 for ; Thu, 27 May 2021 01:40:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233935AbhE0Blk (ORCPT ); Wed, 26 May 2021 21:41:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:36792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232577AbhE0Blg (ORCPT ); Wed, 26 May 2021 21:41:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9DB1D613C1; Thu, 27 May 2021 01:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622079604; bh=3W/BKJCad4klt+G/E3iRGNb3xiL5cjkDt4kpQ4h9KK4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LfhXOvYZIDWu5fUMei2IilMsBnzIG9zyApswz/lrqABDRbnmhpcRE34I8+0GdE2oO 5Qf04mYyB+GIwE/0uceN9WksHUVKs5Y3I1TbhhwQ90dgkVJH/s6Uljqe1jNc6BPlgG t9qxldfmggcDZiCxMOOjFT82P9lqzjVPsK/8KDLOEr+uyHqmZeuOyLEY9+V69OBZBZ BEzNEGMktiv6S6UqeG/hXinUcAiXh3Wh18t/lLBVfzkMNQxKKrFOB4sZEIIbXVOwjo 3KxYMOXomVQUEXVGjIT/F8tqlfqMaUuUsaNfnEh4caDHp/DAfPOJ6lbMlWPZznqwYZ gnZdzN0ZlfWdA== Date: Wed, 26 May 2021 18:40:03 -0700 From: Jaegeuk Kim To: Chao Yu Cc: Chao Yu , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] f2fs: swap: remove dead codes Message-ID: References: <20210526062927.52629-1-yuchao0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/26, Chao Yu wrote: > On 2021/5/26 21:30, Jaegeuk Kim wrote: > > On 05/26, Chao Yu wrote: > > > After commit af4b6b8edf6a ("f2fs: introduce check_swap_activate_fast()"), > > > we will never run into original logic of check_swap_activate() before > > > f2fs supports non 4k-sized page, so let's delete those dead codes. > > > > Why not keeping this for large page support in future maybe? > > Well, if so, at that time, it would be better to refactor > check_swap_activate_fast() implementation based on f2fs_map_block() rather > than refactoring check_swap_activate() implementation based on low efficient > bmap()? Let's first check whether we support large page. Have you quickly tested it? If we support it now and current flow is just inefficient, I'd say keeping but refactoring it later. > > Thanks, > > > > > > > > > Signed-off-by: Chao Yu > > > --- > > > fs/f2fs/data.c | 171 +------------------------------------------------ > > > 1 file changed, 3 insertions(+), 168 deletions(-) > > > > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > > index 3058c7e28b11..9c23fde93b76 100644 > > > --- a/fs/f2fs/data.c > > > +++ b/fs/f2fs/data.c > > > @@ -3830,67 +3830,7 @@ int f2fs_migrate_page(struct address_space *mapping, > > > #endif > > > #ifdef CONFIG_SWAP > > > -static int f2fs_is_file_aligned(struct inode *inode) > > > -{ > > > - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > - block_t main_blkaddr = SM_I(sbi)->main_blkaddr; > > > - block_t cur_lblock; > > > - block_t last_lblock; > > > - block_t pblock; > > > - unsigned long nr_pblocks; > > > - unsigned int blocks_per_sec = BLKS_PER_SEC(sbi); > > > - unsigned int not_aligned = 0; > > > - int ret = 0; > > > - > > > - cur_lblock = 0; > > > - last_lblock = bytes_to_blks(inode, i_size_read(inode)); > > > - > > > - while (cur_lblock < last_lblock) { > > > - struct f2fs_map_blocks map; > > > - > > > - memset(&map, 0, sizeof(map)); > > > - map.m_lblk = cur_lblock; > > > - map.m_len = last_lblock - cur_lblock; > > > - map.m_next_pgofs = NULL; > > > - map.m_next_extent = NULL; > > > - map.m_seg_type = NO_CHECK_TYPE; > > > - map.m_may_create = false; > > > - > > > - ret = f2fs_map_blocks(inode, &map, 0, F2FS_GET_BLOCK_FIEMAP); > > > - if (ret) > > > - goto out; > > > - > > > - /* hole */ > > > - if (!(map.m_flags & F2FS_MAP_FLAGS)) { > > > - f2fs_err(sbi, "Swapfile has holes\n"); > > > - ret = -ENOENT; > > > - goto out; > > > - } > > > - > > > - pblock = map.m_pblk; > > > - nr_pblocks = map.m_len; > > > - > > > - if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || > > > - nr_pblocks & (blocks_per_sec - 1)) { > > > - if (f2fs_is_pinned_file(inode)) { > > > - f2fs_err(sbi, "Swapfile does not align to section"); > > > - ret = -EINVAL; > > > - goto out; > > > - } > > > - not_aligned++; > > > - } > > > - > > > - cur_lblock += nr_pblocks; > > > - } > > > - if (not_aligned) > > > - f2fs_warn(sbi, "Swapfile (%u) is not align to section: \n" > > > - "\t1) creat(), 2) ioctl(F2FS_IOC_SET_PIN_FILE), 3) fallocate()", > > > - not_aligned); > > > -out: > > > - return ret; > > > -} > > > - > > > -static int check_swap_activate_fast(struct swap_info_struct *sis, > > > +static int check_swap_activate(struct swap_info_struct *sis, > > > struct file *swap_file, sector_t *span) > > > { > > > struct address_space *mapping = swap_file->f_mapping; > > > @@ -3907,6 +3847,8 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > unsigned int not_aligned = 0; > > > int ret = 0; > > > + f2fs_bug_on(sbi, PAGE_SIZE != F2FS_BLKSIZE); > > > + > > > /* > > > * Map all the blocks into the extent list. This code doesn't try > > > * to be very smart. > > > @@ -3986,113 +3928,6 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > return ret; > > > } > > > -/* Copied from generic_swapfile_activate() to check any holes */ > > > -static int check_swap_activate(struct swap_info_struct *sis, > > > - struct file *swap_file, sector_t *span) > > > -{ > > > - struct address_space *mapping = swap_file->f_mapping; > > > - struct inode *inode = mapping->host; > > > - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > - unsigned blocks_per_page; > > > - unsigned long page_no; > > > - sector_t probe_block; > > > - sector_t last_block; > > > - sector_t lowest_block = -1; > > > - sector_t highest_block = 0; > > > - int nr_extents = 0; > > > - int ret = 0; > > > - > > > - if (PAGE_SIZE == F2FS_BLKSIZE) > > > - return check_swap_activate_fast(sis, swap_file, span); > > > - > > > - ret = f2fs_is_file_aligned(inode); > > > - if (ret) > > > - goto out; > > > - > > > - blocks_per_page = bytes_to_blks(inode, PAGE_SIZE); > > > - > > > - /* > > > - * Map all the blocks into the extent list. This code doesn't try > > > - * to be very smart. > > > - */ > > > - probe_block = 0; > > > - page_no = 0; > > > - last_block = bytes_to_blks(inode, i_size_read(inode)); > > > - while ((probe_block + blocks_per_page) <= last_block && > > > - page_no < sis->max) { > > > - unsigned block_in_page; > > > - sector_t first_block; > > > - sector_t block = 0; > > > - > > > - cond_resched(); > > > - > > > - block = probe_block; > > > - ret = bmap(inode, &block); > > > - if (ret) > > > - goto out; > > > - if (!block) > > > - goto bad_bmap; > > > - first_block = block; > > > - > > > - /* > > > - * It must be PAGE_SIZE aligned on-disk > > > - */ > > > - if (first_block & (blocks_per_page - 1)) { > > > - probe_block++; > > > - goto reprobe; > > > - } > > > - > > > - for (block_in_page = 1; block_in_page < blocks_per_page; > > > - block_in_page++) { > > > - > > > - block = probe_block + block_in_page; > > > - ret = bmap(inode, &block); > > > - if (ret) > > > - goto out; > > > - if (!block) > > > - goto bad_bmap; > > > - > > > - if (block != first_block + block_in_page) { > > > - /* Discontiguity */ > > > - probe_block++; > > > - goto reprobe; > > > - } > > > - } > > > - > > > - first_block >>= (PAGE_SHIFT - inode->i_blkbits); > > > - if (page_no) { /* exclude the header page */ > > > - if (first_block < lowest_block) > > > - lowest_block = first_block; > > > - if (first_block > highest_block) > > > - highest_block = first_block; > > > - } > > > - > > > - /* > > > - * We found a PAGE_SIZE-length, PAGE_SIZE-aligned run of blocks > > > - */ > > > - ret = add_swap_extent(sis, page_no, 1, first_block); > > > - if (ret < 0) > > > - goto out; > > > - nr_extents += ret; > > > - page_no++; > > > - probe_block += blocks_per_page; > > > -reprobe: > > > - continue; > > > - } > > > - ret = nr_extents; > > > - *span = 1 + highest_block - lowest_block; > > > - if (page_no == 0) > > > - page_no = 1; /* force Empty message */ > > > - sis->max = page_no; > > > - sis->pages = page_no - 1; > > > - sis->highest_bit = page_no - 1; > > > -out: > > > - return ret; > > > -bad_bmap: > > > - f2fs_err(sbi, "Swapfile has holes\n"); > > > - return -EINVAL; > > > -} > > > - > > > static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file, > > > sector_t *span) > > > { > > > -- > > > 2.29.2 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.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,URIBL_BLOCKED autolearn=unavailable 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 1DF00C47082 for ; Thu, 27 May 2021 01:40:19 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BDB12613C5 for ; Thu, 27 May 2021 01:40:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDB12613C5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.92.3) (envelope-from ) id 1lm50T-0001xP-71; Thu, 27 May 2021 01:40:17 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lm50S-0001xJ-9v for linux-f2fs-devel@lists.sourceforge.net; Thu, 27 May 2021 01:40:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YXTekJ35BcwSAAo6Vbh07Km6cOoFSOskQpiGO7FYTv4=; b=CDO3F3B6awA9vbs6RHTVaOBCNK gt7b2klqh38zI2nHTxPkarCj75Mv1DkY1pfPlh+Xt5crun+G28SOm8VaskiHFpdd37tok0/rNG2fc sqfmbO/ubSKvct0mVoH7AttIwj3gY2xp6CLGmskNYbOTXoCf39fyGrHilI8gDmcO0Xng=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=YXTekJ35BcwSAAo6Vbh07Km6cOoFSOskQpiGO7FYTv4=; b=dDG1IKtzlNjfYPemCLY3KdwNFt guk4FzV3y36ICa/JF88cVfkW+jLqQ8oheufrm+1Nt0p6ThEmH5o9YZEsrrdQKN4i/bhIyitsJAvVD C43VwbWunLlwG9TdJAjA8idlE/L3MxDwf2MAKtt1N+ZsTD3/ot+vjmzGo4Qw+VTsdqyA=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lm50L-0001aB-0E for linux-f2fs-devel@lists.sourceforge.net; Thu, 27 May 2021 01:40:16 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9DB1D613C1; Thu, 27 May 2021 01:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622079604; bh=3W/BKJCad4klt+G/E3iRGNb3xiL5cjkDt4kpQ4h9KK4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LfhXOvYZIDWu5fUMei2IilMsBnzIG9zyApswz/lrqABDRbnmhpcRE34I8+0GdE2oO 5Qf04mYyB+GIwE/0uceN9WksHUVKs5Y3I1TbhhwQ90dgkVJH/s6Uljqe1jNc6BPlgG t9qxldfmggcDZiCxMOOjFT82P9lqzjVPsK/8KDLOEr+uyHqmZeuOyLEY9+V69OBZBZ BEzNEGMktiv6S6UqeG/hXinUcAiXh3Wh18t/lLBVfzkMNQxKKrFOB4sZEIIbXVOwjo 3KxYMOXomVQUEXVGjIT/F8tqlfqMaUuUsaNfnEh4caDHp/DAfPOJ6lbMlWPZznqwYZ gnZdzN0ZlfWdA== Date: Wed, 26 May 2021 18:40:03 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: References: <20210526062927.52629-1-yuchao0@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Headers-End: 1lm50L-0001aB-0E Subject: Re: [f2fs-dev] [PATCH 1/2] f2fs: swap: remove dead codes X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 05/26, Chao Yu wrote: > On 2021/5/26 21:30, Jaegeuk Kim wrote: > > On 05/26, Chao Yu wrote: > > > After commit af4b6b8edf6a ("f2fs: introduce check_swap_activate_fast()"), > > > we will never run into original logic of check_swap_activate() before > > > f2fs supports non 4k-sized page, so let's delete those dead codes. > > > > Why not keeping this for large page support in future maybe? > > Well, if so, at that time, it would be better to refactor > check_swap_activate_fast() implementation based on f2fs_map_block() rather > than refactoring check_swap_activate() implementation based on low efficient > bmap()? Let's first check whether we support large page. Have you quickly tested it? If we support it now and current flow is just inefficient, I'd say keeping but refactoring it later. > > Thanks, > > > > > > > > > Signed-off-by: Chao Yu > > > --- > > > fs/f2fs/data.c | 171 +------------------------------------------------ > > > 1 file changed, 3 insertions(+), 168 deletions(-) > > > > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > > index 3058c7e28b11..9c23fde93b76 100644 > > > --- a/fs/f2fs/data.c > > > +++ b/fs/f2fs/data.c > > > @@ -3830,67 +3830,7 @@ int f2fs_migrate_page(struct address_space *mapping, > > > #endif > > > #ifdef CONFIG_SWAP > > > -static int f2fs_is_file_aligned(struct inode *inode) > > > -{ > > > - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > - block_t main_blkaddr = SM_I(sbi)->main_blkaddr; > > > - block_t cur_lblock; > > > - block_t last_lblock; > > > - block_t pblock; > > > - unsigned long nr_pblocks; > > > - unsigned int blocks_per_sec = BLKS_PER_SEC(sbi); > > > - unsigned int not_aligned = 0; > > > - int ret = 0; > > > - > > > - cur_lblock = 0; > > > - last_lblock = bytes_to_blks(inode, i_size_read(inode)); > > > - > > > - while (cur_lblock < last_lblock) { > > > - struct f2fs_map_blocks map; > > > - > > > - memset(&map, 0, sizeof(map)); > > > - map.m_lblk = cur_lblock; > > > - map.m_len = last_lblock - cur_lblock; > > > - map.m_next_pgofs = NULL; > > > - map.m_next_extent = NULL; > > > - map.m_seg_type = NO_CHECK_TYPE; > > > - map.m_may_create = false; > > > - > > > - ret = f2fs_map_blocks(inode, &map, 0, F2FS_GET_BLOCK_FIEMAP); > > > - if (ret) > > > - goto out; > > > - > > > - /* hole */ > > > - if (!(map.m_flags & F2FS_MAP_FLAGS)) { > > > - f2fs_err(sbi, "Swapfile has holes\n"); > > > - ret = -ENOENT; > > > - goto out; > > > - } > > > - > > > - pblock = map.m_pblk; > > > - nr_pblocks = map.m_len; > > > - > > > - if ((pblock - main_blkaddr) & (blocks_per_sec - 1) || > > > - nr_pblocks & (blocks_per_sec - 1)) { > > > - if (f2fs_is_pinned_file(inode)) { > > > - f2fs_err(sbi, "Swapfile does not align to section"); > > > - ret = -EINVAL; > > > - goto out; > > > - } > > > - not_aligned++; > > > - } > > > - > > > - cur_lblock += nr_pblocks; > > > - } > > > - if (not_aligned) > > > - f2fs_warn(sbi, "Swapfile (%u) is not align to section: \n" > > > - "\t1) creat(), 2) ioctl(F2FS_IOC_SET_PIN_FILE), 3) fallocate()", > > > - not_aligned); > > > -out: > > > - return ret; > > > -} > > > - > > > -static int check_swap_activate_fast(struct swap_info_struct *sis, > > > +static int check_swap_activate(struct swap_info_struct *sis, > > > struct file *swap_file, sector_t *span) > > > { > > > struct address_space *mapping = swap_file->f_mapping; > > > @@ -3907,6 +3847,8 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > unsigned int not_aligned = 0; > > > int ret = 0; > > > + f2fs_bug_on(sbi, PAGE_SIZE != F2FS_BLKSIZE); > > > + > > > /* > > > * Map all the blocks into the extent list. This code doesn't try > > > * to be very smart. > > > @@ -3986,113 +3928,6 @@ static int check_swap_activate_fast(struct swap_info_struct *sis, > > > return ret; > > > } > > > -/* Copied from generic_swapfile_activate() to check any holes */ > > > -static int check_swap_activate(struct swap_info_struct *sis, > > > - struct file *swap_file, sector_t *span) > > > -{ > > > - struct address_space *mapping = swap_file->f_mapping; > > > - struct inode *inode = mapping->host; > > > - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > > > - unsigned blocks_per_page; > > > - unsigned long page_no; > > > - sector_t probe_block; > > > - sector_t last_block; > > > - sector_t lowest_block = -1; > > > - sector_t highest_block = 0; > > > - int nr_extents = 0; > > > - int ret = 0; > > > - > > > - if (PAGE_SIZE == F2FS_BLKSIZE) > > > - return check_swap_activate_fast(sis, swap_file, span); > > > - > > > - ret = f2fs_is_file_aligned(inode); > > > - if (ret) > > > - goto out; > > > - > > > - blocks_per_page = bytes_to_blks(inode, PAGE_SIZE); > > > - > > > - /* > > > - * Map all the blocks into the extent list. This code doesn't try > > > - * to be very smart. > > > - */ > > > - probe_block = 0; > > > - page_no = 0; > > > - last_block = bytes_to_blks(inode, i_size_read(inode)); > > > - while ((probe_block + blocks_per_page) <= last_block && > > > - page_no < sis->max) { > > > - unsigned block_in_page; > > > - sector_t first_block; > > > - sector_t block = 0; > > > - > > > - cond_resched(); > > > - > > > - block = probe_block; > > > - ret = bmap(inode, &block); > > > - if (ret) > > > - goto out; > > > - if (!block) > > > - goto bad_bmap; > > > - first_block = block; > > > - > > > - /* > > > - * It must be PAGE_SIZE aligned on-disk > > > - */ > > > - if (first_block & (blocks_per_page - 1)) { > > > - probe_block++; > > > - goto reprobe; > > > - } > > > - > > > - for (block_in_page = 1; block_in_page < blocks_per_page; > > > - block_in_page++) { > > > - > > > - block = probe_block + block_in_page; > > > - ret = bmap(inode, &block); > > > - if (ret) > > > - goto out; > > > - if (!block) > > > - goto bad_bmap; > > > - > > > - if (block != first_block + block_in_page) { > > > - /* Discontiguity */ > > > - probe_block++; > > > - goto reprobe; > > > - } > > > - } > > > - > > > - first_block >>= (PAGE_SHIFT - inode->i_blkbits); > > > - if (page_no) { /* exclude the header page */ > > > - if (first_block < lowest_block) > > > - lowest_block = first_block; > > > - if (first_block > highest_block) > > > - highest_block = first_block; > > > - } > > > - > > > - /* > > > - * We found a PAGE_SIZE-length, PAGE_SIZE-aligned run of blocks > > > - */ > > > - ret = add_swap_extent(sis, page_no, 1, first_block); > > > - if (ret < 0) > > > - goto out; > > > - nr_extents += ret; > > > - page_no++; > > > - probe_block += blocks_per_page; > > > -reprobe: > > > - continue; > > > - } > > > - ret = nr_extents; > > > - *span = 1 + highest_block - lowest_block; > > > - if (page_no == 0) > > > - page_no = 1; /* force Empty message */ > > > - sis->max = page_no; > > > - sis->pages = page_no - 1; > > > - sis->highest_bit = page_no - 1; > > > -out: > > > - return ret; > > > -bad_bmap: > > > - f2fs_err(sbi, "Swapfile has holes\n"); > > > - return -EINVAL; > > > -} > > > - > > > static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file, > > > sector_t *span) > > > { > > > -- > > > 2.29.2 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel