From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sheng Yong Subject: Re: [PATCH v3 28/39] ubifs: record quota information about inode in ubifs_new_inode Date: Tue, 15 Sep 2015 17:35:25 +0800 Message-ID: <55F7E65D.7060903@huawei.com> References: <1442307754-13233-1-git-send-email-yangds.fnst@cn.fujitsu.com> <1442307754-13233-29-git-send-email-yangds.fnst@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: , To: Dongsheng Yang , , , , Return-path: Received: from szxga03-in.huawei.com ([119.145.14.66]:46392 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751929AbbIOJh2 (ORCPT ); Tue, 15 Sep 2015 05:37:28 -0400 In-Reply-To: <1442307754-13233-29-git-send-email-yangds.fnst@cn.fujitsu.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On 9/15/2015 5:02 PM, Dongsheng Yang wrote: > Initialize quota and alloc a inode quota information in > ubifs_new_inode(). Then quota would be aware of a new > inode is allocated. > > Signed-off-by: Dongsheng Yang > --- > fs/ubifs/dir.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c > index 4db0ceb..802c6ad 100644 > --- a/fs/ubifs/dir.c > +++ b/fs/ubifs/dir.c > @@ -41,6 +41,7 @@ > */ > > #include "ubifs.h" > +#include > > /** > * inherit_flags - inherit flags of the parent inode. > @@ -90,6 +91,7 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, > { > struct inode *inode; > struct ubifs_inode *ui; > + int err = 0; > > inode = new_inode(c->vfs_sb); > if (!inode) > @@ -109,6 +111,11 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, > ubifs_current_time(inode); > inode->i_mapping->nrpages = 0; > > + dquot_initialize(inode); > + err = dquot_alloc_inode(inode); > + if (err) > + goto fail_drop; > + Hi, Dongsheng I got a question here, it seems the inode used for xattr may not be counted in? thanks, Sheng > switch (mode & S_IFMT) { > case S_IFREG: > inode->i_mapping->a_ops = &ubifs_file_address_operations; > @@ -148,8 +155,8 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, > spin_unlock(&c->cnt_lock); > ubifs_err(c, "out of inode numbers"); > make_bad_inode(inode); > - iput(inode); > - return ERR_PTR(-EINVAL); > + err = -EINVAL; > + goto fail_free; > } > ubifs_warn(c, "running out of inode numbers (current %lu, max %u)", > (unsigned long)c->highest_inum, INUM_WATERMARK); > @@ -166,6 +173,13 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, > ui->creat_sqnum = ++c->max_sqnum; > spin_unlock(&c->cnt_lock); > return inode; > + > +fail_free: > + dquot_free_inode(inode); > +fail_drop: > + dquot_drop(inode); > + iput(inode); > + return ERR_PTR(err); > } > > static int dbg_check_name(const struct ubifs_info *c, >