From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752950AbdCIIxn (ORCPT ); Thu, 9 Mar 2017 03:53:43 -0500 Received: from szxga03-in.huawei.com ([45.249.212.189]:3951 "EHLO dggrg03-dlp.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750793AbdCIIxm (ORCPT ); Thu, 9 Mar 2017 03:53:42 -0500 Subject: Re: [f2fs-dev] [PATCH 1/4] f2fs: fix wrong error injection for evict_inode To: Jaegeuk Kim , , , References: <20170307221303.6757-1-jaegeuk@kernel.org> From: Chao Yu Message-ID: <231281e5-15b5-6214-4e73-8008b49a0fd8@huawei.com> Date: Thu, 9 Mar 2017 16:53:29 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <20170307221303.6757-1-jaegeuk@kernel.org> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.58C1180D.0238,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 5582a3b4ad1e1a681d185ea3f92924fb Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jaegeuk, On 2017/3/8 6:13, Jaegeuk Kim wrote: > The previous one was not a proper location to inject an error, since there > is no point to get errors. Instead, we can emulate EIO during truncation, > and the below logic should handle it correctly. > > Signed-off-by: Jaegeuk Kim > --- > fs/f2fs/inode.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c > index ef8610bf950f..2520fa72b23f 100644 > --- a/fs/f2fs/inode.c > +++ b/fs/f2fs/inode.c > @@ -372,13 +372,6 @@ void f2fs_evict_inode(struct inode *inode) > if (inode->i_nlink || is_bad_inode(inode)) > goto no_delete; > > -#ifdef CONFIG_F2FS_FAULT_INJECTION > - if (time_to_inject(sbi, FAULT_EVICT_INODE)) { > - f2fs_show_injection_info(FAULT_EVICT_INODE); > - goto no_delete; > - } > -#endif > - > remove_ino_entry(sbi, inode->i_ino, APPEND_INO); > remove_ino_entry(sbi, inode->i_ino, UPDATE_INO); > > @@ -389,6 +382,12 @@ void f2fs_evict_inode(struct inode *inode) > if (F2FS_HAS_BLOCKS(inode)) In addition, how about add below code to emulate error came from f2fs_truncate? if (F2FS_HAS_BLOCKS(inode)) { #ifdef CONFIG_F2FS_FAULT_INJECTION if (time_to_inject(sbi, FAULT_EVICT_INODE)) { f2fs_show_injection_info(FAULT_EVICT_INODE); err = -EIO; } #endif if (!err) err = f2fs_truncate(inode); } Thanks, > err = f2fs_truncate(inode); > > +#ifdef CONFIG_F2FS_FAULT_INJECTION > + if (time_to_inject(sbi, FAULT_EVICT_INODE)) { > + f2fs_show_injection_info(FAULT_EVICT_INODE); > + err = -EIO; > + } > +#endif > if (!err) { > f2fs_lock_op(sbi); > err = remove_inode_page(inode); >