Received: by 2002:a05:7412:bbc7:b0:fc:a2b0:25d7 with SMTP id kh7csp2796917rdb; Mon, 5 Feb 2024 19:37:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IEd4lcsP7luVhNp7dwE6ot9gA2vKkJOpXnH5QuoXFa/7EBei0j7c7EZSV/c9/VldFwwLFWq X-Received: by 2002:a05:6359:1505:b0:178:c4f4:4ae1 with SMTP id jt5-20020a056359150500b00178c4f44ae1mr2165050rwb.13.1707190668591; Mon, 05 Feb 2024 19:37:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707190668; cv=pass; d=google.com; s=arc-20160816; b=Vm+xoXewfzVHnaCVYBDPAx+ygchoTZjVdiqexFyD5tH0biYyzMjI6lL8grorIXZZGs tL6WEUhrmcUgKtjGsNuUm/ZblDtrCR14mEj8QTclpoVDmoowyzDfePdu42e0kkaOROGu W/MmmBfquPmNTwBLy3HqY914PMxGaE0z/S0x3xdVWcUtp1qClqyTTZvPeY84BbHk9Gne E2NdzwKnusvNtLGOjYFbRODmx8DvgkT0g4r2KUeew0esK9bMSluS27IhwVkIoPn2DHru sAxPUmjnXKVJn1h77SU6rjA06EXwl2GuucPyyrT0XVtXtwTMVQ28YrcS8gpdgqhzageu z/QA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=3UkrEUGWVYdLCb/tsT0p8SSivyFwOmuJ6TCUqVEYoYs=; fh=uJJLys/QMCA7TBn5IEqCVJGPHK9Bkfm57UxuTEgDOAo=; b=T1i3A31QV2Yrn/i30UmwqVHsMfFvbsueoKw5F0TRxOXsdmb+g+rrAtBxjafdmaVbVt 4CZT+HONEqDDVGpEwnsd82A/65RYEuN8F4n0mqkd8p6x0GOv7PFEv8sct5SyRzj6bU4k H7Yn1t3yfpFYRr9Lw/NrnhoiSXXiPZM3YNVlOhWIZsBcx+qrXduceb6i8PVqgF4NgXKg BV2/CUrxoZN/mSZeMFOtalEYCl7D2DYbGrYdTZuX/h/lnGY9Y/cnelfkqiouyO7CXYdR 0wiwECqIO9UZA5CkSFxx76N/ihJR89HtgtvzYWhqJKGFeBqvjnF9CxOv3qXthLvE3dX6 uTOg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="IYo51v/0"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-54266-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54266-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCVNxc7MzVUV43CbWH6EEC+ByS4Uqpl1pBmIl8ZifgDcgVYEPv/8V9fCqdjDATmf8VbSCAfZGOa+pgtO3jlxo221PYh3N4xvgssBUAUO8A== Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id f20-20020a631014000000b005dbec1f4dd1si954238pgl.367.2024.02.05.19.37.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 19:37:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54266-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="IYo51v/0"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-54266-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54266-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 8E880B23DC1 for ; Tue, 6 Feb 2024 03:36:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BD33C745DC; Tue, 6 Feb 2024 03:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IYo51v/0" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33E8D5026D for ; Tue, 6 Feb 2024 03:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707190590; cv=none; b=d94ZgacT1K6BjM4MYCFiD6t/r53a4TNwlP6y+5eMn9L//bO9WgZ6SqH9JQleRTC0TY4dWBr2BL6xIW3ES5nkjWj1XPhB5PvrRamJ8lJCzbODYWpmiPURBCXG6d0dxba8wQ9hwwLqmygkF6zKQM9XWg7gDkvb26+2Rop91gk+CsE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707190590; c=relaxed/simple; bh=EV4sYa/n38D6XJKysy1Ovo5D+uXKl0Lz3vicJpuENoA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=KCrGBDpq11O5v+MV5Nqy9smdpuKQdDpNExqSi3CpER+VIWYH9FwzIABoJd68z++AeB9fA75dvnneJlJDE5hViowAuJfP9zEQDEAE5y1z+hHB0Bu0fSP90DohcOe7AmbY8rKUT87m+zIevvNL9tyK08H+Ud1tFwtJvFiFbFA5tfk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IYo51v/0; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 922B3C433F1; Tue, 6 Feb 2024 03:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707190589; bh=EV4sYa/n38D6XJKysy1Ovo5D+uXKl0Lz3vicJpuENoA=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=IYo51v/09/3F1imTPs8gw7Wd81xVdIxwwGPfw9xHactsrVUkCK0cgJ1rcKisjW75i f4KQ2YcR1zAxeYVBBTMU70t9yaHChguK4Bpg5rVjBSQDbXZT3oNKUlWoUqPW84QgAI A3iwGad96rVVxw1Gh36PV+74rqvRQabm3KJrXF3qtDlXjIhRVtJeia9+0gNTygXHYk Hv31XN769Y6zl69VwRGcG0T54ERwAnJNAmQL/4Nk8xPsIk8Mv+CNi16eLoj86O7Vid mD2Vub/xszIUpGfiw//q3W/5rPLXgi/xJ/2uCb34fK4r0xc+GpGwWcgZ0u/qDh2Out LWN9DQ3Lil4Kg== Message-ID: <2155b7d2-f7ee-4ce6-b4c9-48f715f6aa00@kernel.org> Date: Tue, 6 Feb 2024 11:36:24 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7] f2fs: unify the error handling of f2fs_is_valid_blkaddr Content-Language: en-US To: Jaegeuk Kim Cc: Zhiguo Niu , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, niuzhiguo84@gmail.com, ke.wang@unisoc.com, hongyu.jin@unisoc.com References: <1707103845-17220-1-git-send-email-zhiguo.niu@unisoc.com> From: Chao Yu In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2024/2/6 11:32, Jaegeuk Kim wrote: > On 02/05, Chao Yu wrote: >> On 2024/2/5 11:30, Zhiguo Niu wrote: >>> There are some cases of f2fs_is_valid_blkaddr not handled as >>> ERROR_INVALID_BLKADDR,so unify the error handling about all of >>> f2fs_is_valid_blkaddr. >>> >>> Signed-off-by: Zhiguo Niu >>> Signed-off-by: Chao Yu >>> --- >>> changes of v7: update patch according to sync with Chao >>> -restore some code to original >>> -modify err handle of __is_bitmap_valid for covering all cases >>> changes of v6: improve patch according to Chao's suggestions >>> -restore dump_stack to original position >>> -adjuest code sequence of __is_bitmap_check_valid >>> changes of v5: improve patch according to Jaegeuk's suggestiongs >>> -restore return value of some f2fs_is_valid_blkaddr error case to original >>> -move cp_err checking to outermost for unified processing >>> -return true directly for case (type=DATA_GENERIC_ENHANCE_READ) in >>> __is_bitmap_valid to avoid meaningless flow >>> -rename __is_bitmap_valid to __is_bitmap_check_valid for avoiding ambiguity >>> and handling its return value in the caller uniformly, also cooperate >>> switch checking true to false for error case of >>> f2fs_is_valid_blkaddr(type=DATA_GENERIC_ENHANCE_UPDATE) in do_recover_data >>> for more readable >>> changes of v4: update according to the latest code >>> changes of v3: >>> -rebase patch to dev-test >>> -correct return value for some f2fs_is_valid_blkaddr error case >>> changes of v2: improve patch according Chao's suggestions. >>> --- >>> --- >>> fs/f2fs/checkpoint.c | 33 ++++++++++++++++++--------------- >>> fs/f2fs/data.c | 22 +++------------------- >>> fs/f2fs/extent_cache.c | 5 +---- >>> fs/f2fs/file.c | 16 +++------------- >>> fs/f2fs/gc.c | 2 -- >>> fs/f2fs/recovery.c | 4 ---- >>> fs/f2fs/segment.c | 2 -- >>> 7 files changed, 25 insertions(+), 59 deletions(-) >>> >>> diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c >>> index b85820e..3335619 100644 >>> --- a/fs/f2fs/checkpoint.c >>> +++ b/fs/f2fs/checkpoint.c >>> @@ -154,46 +154,43 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr, >>> if (unlikely(f2fs_cp_error(sbi))) >>> return exist; >>> - if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) { >>> - f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", >>> - blkaddr, exist); >>> - set_sbi_flag(sbi, SBI_NEED_FSCK); >>> - return exist; >>> - } >>> - >>> - if (!exist && type == DATA_GENERIC_ENHANCE) { >>> + if ((exist && type == DATA_GENERIC_ENHANCE_UPDATE) || >>> + (!exist && type == DATA_GENERIC_ENHANCE)) { >>> f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", >>> blkaddr, exist); >>> set_sbi_flag(sbi, SBI_NEED_FSCK); >>> dump_stack(); >>> } >>> + >> >> No need to add one blank line. >> >> Otherwise, it looks good to me. >> >> Reviewed-by: Chao Yu >> >> Thanks, >> >>> return exist; >>> } >>> static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, >>> block_t blkaddr, int type) >>> { >>> + bool valid = false; >>> + >>> switch (type) { >>> case META_NAT: >>> break; >>> case META_SIT: >>> if (unlikely(blkaddr >= SIT_BLK_CNT(sbi))) >>> - return false; >>> + goto err; >>> break; >>> case META_SSA: >>> if (unlikely(blkaddr >= MAIN_BLKADDR(sbi) || >>> blkaddr < SM_I(sbi)->ssa_blkaddr)) >>> - return false; >>> + goto err; >>> break; >>> case META_CP: >>> if (unlikely(blkaddr >= SIT_I(sbi)->sit_base_addr || >>> blkaddr < __start_cp_addr(sbi))) >>> - return false; >>> + goto err; >>> break; >>> case META_POR: >>> if (unlikely(blkaddr >= MAX_BLKADDR(sbi) || >>> blkaddr < MAIN_BLKADDR(sbi))) >>> - return false; >>> + goto err; >>> break; >>> case DATA_GENERIC: >>> case DATA_GENERIC_ENHANCE: >>> @@ -210,21 +207,27 @@ static bool __f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, >>> blkaddr); >>> set_sbi_flag(sbi, SBI_NEED_FSCK); >>> dump_stack(); >>> - return false; >>> + goto err; >>> } else { >>> - return __is_bitmap_valid(sbi, blkaddr, type); >>> + valid = __is_bitmap_valid(sbi, blkaddr, type); >>> + if ((!valid && type != DATA_GENERIC_ENHANCE_UPDATE) || >>> + (valid && type == DATA_GENERIC_ENHANCE_UPDATE)) >>> + goto err; > > Please think about how to optimize this, which is really ugly now. How about calling f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR) inside __is_bitmap_valid()? so that we may not add such logic outside __is_bitmap_valid()... Thanks, > >>> } >>> break; >>> case META_GENERIC: >>> if (unlikely(blkaddr < SEG0_BLKADDR(sbi) || >>> blkaddr >= MAIN_BLKADDR(sbi))) >>> - return false; >>> + goto err; >>> break; >>> default: >>> BUG(); >>> } >>> return true; >>> +err: >>> + f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> + return valid; >>> } >>> bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, >>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c >>> index 05158f8..300f9ae 100644 >>> --- a/fs/f2fs/data.c >>> +++ b/fs/f2fs/data.c >>> @@ -738,10 +738,8 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) >>> if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr, >>> fio->is_por ? META_POR : (__is_meta_io(fio) ? >>> - META_GENERIC : DATA_GENERIC_ENHANCE))) { >>> - f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR); >>> + META_GENERIC : DATA_GENERIC_ENHANCE))) >>> return -EFSCORRUPTED; >>> - } >>> trace_f2fs_submit_page_bio(page, fio); >>> @@ -946,10 +944,8 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) >>> fio->encrypted_page : fio->page; >>> if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr, >>> - __is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) { >>> - f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR); >>> + __is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) >>> return -EFSCORRUPTED; >>> - } >>> trace_f2fs_submit_page_bio(page, fio); >>> @@ -1286,8 +1282,6 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index, >>> if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), dn.data_blkaddr, >>> DATA_GENERIC_ENHANCE_READ)) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(F2FS_I_SB(inode), >>> - ERROR_INVALID_BLKADDR); >>> goto put_err; >>> } >>> goto got_it; >>> @@ -1313,8 +1307,6 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index, >>> dn.data_blkaddr, >>> DATA_GENERIC_ENHANCE)) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(F2FS_I_SB(inode), >>> - ERROR_INVALID_BLKADDR); >>> goto put_err; >>> } >>> got_it: >>> @@ -1642,7 +1634,6 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag) >>> if (!is_hole && >>> !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> goto sync_out; >>> } >>> @@ -2166,8 +2157,6 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, >>> if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), block_nr, >>> DATA_GENERIC_ENHANCE_READ)) { >>> ret = -EFSCORRUPTED; >>> - f2fs_handle_error(F2FS_I_SB(inode), >>> - ERROR_INVALID_BLKADDR); >>> goto out; >>> } >>> } else { >>> @@ -2707,11 +2696,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) >>> f2fs_lookup_read_extent_cache_block(inode, page->index, >>> &fio->old_blkaddr)) { >>> if (!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr, >>> - DATA_GENERIC_ENHANCE)) { >>> - f2fs_handle_error(fio->sbi, >>> - ERROR_INVALID_BLKADDR); >>> + DATA_GENERIC_ENHANCE)) >>> return -EFSCORRUPTED; >>> - } >>> ipu_force = true; >>> fio->need_lock = LOCK_DONE; >>> @@ -2739,7 +2725,6 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) >>> !f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr, >>> DATA_GENERIC_ENHANCE)) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR); >>> goto out_writepage; >>> } >>> @@ -3706,7 +3691,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, >>> if (!f2fs_is_valid_blkaddr(sbi, blkaddr, >>> DATA_GENERIC_ENHANCE_READ)) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> goto fail; >>> } >>> err = f2fs_submit_page_read(use_cow ? >>> diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c >>> index ad8dfac7..48048fa 100644 >>> --- a/fs/f2fs/extent_cache.c >>> +++ b/fs/f2fs/extent_cache.c >>> @@ -43,7 +43,6 @@ bool sanity_check_extent_cache(struct inode *inode) >>> if (!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE) || >>> !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1, >>> DATA_GENERIC_ENHANCE)) { >>> - set_sbi_flag(sbi, SBI_NEED_FSCK); >>> f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix", >>> __func__, inode->i_ino, >>> ei->blk, ei->fofs, ei->len); >>> @@ -856,10 +855,8 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei, >>> goto out; >>> if (__is_valid_data_blkaddr(blkaddr) && >>> - !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) { >>> - f2fs_bug_on(sbi, 1); >>> + !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) >>> return -EINVAL; >>> - } >>> out: >>> /* >>> * init block age with zero, this can happen when the block age extent >>> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c >>> index 25b119cf..23cd6a1 100644 >>> --- a/fs/f2fs/file.c >>> +++ b/fs/f2fs/file.c >>> @@ -593,10 +593,8 @@ void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count) >>> if (time_to_inject(sbi, FAULT_BLKADDR_CONSISTENCE)) >>> continue; >>> if (!f2fs_is_valid_blkaddr_raw(sbi, blkaddr, >>> - DATA_GENERIC_ENHANCE)) { >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> + DATA_GENERIC_ENHANCE)) >>> continue; >>> - } >>> if (compressed_cluster) >>> valid_blocks++; >>> } >>> @@ -1196,7 +1194,6 @@ static int __read_out_blkaddrs(struct inode *inode, block_t *blkaddr, >>> !f2fs_is_valid_blkaddr(sbi, *blkaddr, >>> DATA_GENERIC_ENHANCE)) { >>> f2fs_put_dnode(&dn); >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> return -EFSCORRUPTED; >>> } >>> @@ -1482,7 +1479,6 @@ static int f2fs_do_zero_range(struct dnode_of_data *dn, pgoff_t start, >>> if (!f2fs_is_valid_blkaddr(sbi, dn->data_blkaddr, >>> DATA_GENERIC_ENHANCE)) { >>> ret = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> break; >>> } >>> @@ -3442,10 +3438,8 @@ static int release_compress_blocks(struct dnode_of_data *dn, pgoff_t count) >>> if (!__is_valid_data_blkaddr(blkaddr)) >>> continue; >>> if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr, >>> - DATA_GENERIC_ENHANCE))) { >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> + DATA_GENERIC_ENHANCE))) >>> return -EFSCORRUPTED; >>> - } >>> } >>> while (count) { >>> @@ -3607,10 +3601,8 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count) >>> if (!__is_valid_data_blkaddr(blkaddr)) >>> continue; >>> if (unlikely(!f2fs_is_valid_blkaddr(sbi, blkaddr, >>> - DATA_GENERIC_ENHANCE))) { >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> + DATA_GENERIC_ENHANCE))) >>> return -EFSCORRUPTED; >>> - } >>> } >>> while (count) { >>> @@ -3894,8 +3886,6 @@ static int f2fs_sec_trim_file(struct file *filp, unsigned long arg) >>> DATA_GENERIC_ENHANCE)) { >>> ret = -EFSCORRUPTED; >>> f2fs_put_dnode(&dn); >>> - f2fs_handle_error(sbi, >>> - ERROR_INVALID_BLKADDR); >>> goto out; >>> } >>> diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c >>> index a079eeb..30e93d8 100644 >>> --- a/fs/f2fs/gc.c >>> +++ b/fs/f2fs/gc.c >>> @@ -1197,7 +1197,6 @@ static int ra_data_block(struct inode *inode, pgoff_t index) >>> if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr, >>> DATA_GENERIC_ENHANCE_READ))) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> goto put_page; >>> } >>> goto got_it; >>> @@ -1216,7 +1215,6 @@ static int ra_data_block(struct inode *inode, pgoff_t index) >>> if (unlikely(!f2fs_is_valid_blkaddr(sbi, dn.data_blkaddr, >>> DATA_GENERIC_ENHANCE))) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> goto put_page; >>> } >>> got_it: >>> diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c >>> index aad1d1a..289c0bf 100644 >>> --- a/fs/f2fs/recovery.c >>> +++ b/fs/f2fs/recovery.c >>> @@ -693,14 +693,12 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, >>> if (__is_valid_data_blkaddr(src) && >>> !f2fs_is_valid_blkaddr(sbi, src, META_POR)) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> goto err; >>> } >>> if (__is_valid_data_blkaddr(dest) && >>> !f2fs_is_valid_blkaddr(sbi, dest, META_POR)) { >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); >>> goto err; >>> } >>> @@ -755,8 +753,6 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, >>> f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%lu, ofs:%u", >>> dest, inode->i_ino, dn.ofs_in_node); >>> err = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, >>> - ERROR_INVALID_BLKADDR); >>> goto err; >>> } >>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c >>> index 7901ede..ad6511f 100644 >>> --- a/fs/f2fs/segment.c >>> +++ b/fs/f2fs/segment.c >>> @@ -334,8 +334,6 @@ static int __f2fs_commit_atomic_write(struct inode *inode) >>> DATA_GENERIC_ENHANCE)) { >>> f2fs_put_dnode(&dn); >>> ret = -EFSCORRUPTED; >>> - f2fs_handle_error(sbi, >>> - ERROR_INVALID_BLKADDR); >>> goto out; >>> }