From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935424AbeBMOde (ORCPT ); Tue, 13 Feb 2018 09:33:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:53946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964950AbeBMOdc (ORCPT ); Tue, 13 Feb 2018 09:33:32 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6918E21723 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=chao@kernel.org Subject: Re: [f2fs-dev] [PATCH] f2fs: handle quota for orphan inodes To: Jaegeuk Kim , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net References: <20180210022841.5707-1-jaegeuk@kernel.org> From: Chao Yu Message-ID: Date: Tue, 13 Feb 2018 22:33:26 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180210022841.5707-1-jaegeuk@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2018/2/10 10:28, Jaegeuk Kim wrote: > This is to fix missing dquot_initialize for orphan inodes. IMO, we don't need to call dquot_initialize as we have call the function in evict(), right? Thanks, > > Signed-off-by: Jaegeuk Kim > --- > fs/f2fs/checkpoint.c | 28 ++++++++++++++++------------ > 1 file changed, 16 insertions(+), 12 deletions(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index 8b0945ba284d..e3bf753a47be 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -569,13 +569,8 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) > struct node_info ni; > int err = acquire_orphan_inode(sbi); > > - if (err) { > - set_sbi_flag(sbi, SBI_NEED_FSCK); > - f2fs_msg(sbi->sb, KERN_WARNING, > - "%s: orphan failed (ino=%x), run fsck to fix.", > - __func__, ino); > - return err; > - } > + if (err) > + goto err_out; > > __add_ino_entry(sbi, ino, 0, ORPHAN_INO); > > @@ -589,6 +584,11 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) > return PTR_ERR(inode); > } > > + err = dquot_initialize(inode); > + if (err) > + goto err_out; > + > + dquot_initialize(inode); > clear_nlink(inode); > > /* truncate all the data during iput */ > @@ -598,14 +598,18 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) > > /* ENOMEM was fully retried in f2fs_evict_inode. */ > if (ni.blk_addr != NULL_ADDR) { > - set_sbi_flag(sbi, SBI_NEED_FSCK); > - f2fs_msg(sbi->sb, KERN_WARNING, > - "%s: orphan failed (ino=%x) by kernel, retry mount.", > - __func__, ino); > - return -EIO; > + err = -EIO; > + goto err_out; > } > __remove_ino_entry(sbi, ino, ORPHAN_INO); > return 0; > + > +err_out: > + set_sbi_flag(sbi, SBI_NEED_FSCK); > + f2fs_msg(sbi->sb, KERN_WARNING, > + "%s: orphan failed (ino=%x), run fsck to fix.", > + __func__, ino); > + return err; > } > > int recover_orphan_inodes(struct f2fs_sb_info *sbi) >