From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org,
Theodore Ts'o <tytso@mit.edu>,
linux-kernel@vger.kernel.org, Jan Kara <jack@suse.com>
Cc: Li Xi <lixi@ddn.com>, Dmitry Monakhov <dmtrmonakhov@yandex-team.ru>
Subject: [PATCH] fs/ext4: get project quota from inode for mangling statfs results
Date: Mon, 28 Oct 2019 13:38:43 +0300 [thread overview]
Message-ID: <157225912326.3929.8539227851002947260.stgit@buzz> (raw)
Right now ext4_statfs_project() does quota lookup by id every time.
This is costly operation, especially if there is no inode who hold
reference to this quota and dqget() reads it from disk each time.
Function ext4_statfs_project() could be moved into generic quota code,
it is required for every filesystem which uses generic project quota.
Reported-by: Dmitry Monakhov <dmtrmonakhov@yandex-team.ru>
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
---
fs/ext4/super.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index dd654e53ba3d..f841c66aa499 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5532,18 +5532,23 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
}
#ifdef CONFIG_QUOTA
-static int ext4_statfs_project(struct super_block *sb,
- kprojid_t projid, struct kstatfs *buf)
+static int ext4_statfs_project(struct inode *inode, struct kstatfs *buf)
{
- struct kqid qid;
+ struct super_block *sb = inode->i_sb;
struct dquot *dquot;
u64 limit;
u64 curblock;
+ int err;
+
+ err = dquot_initialize(inode);
+ if (err)
+ return err;
+
+ spin_lock(&inode->i_lock);
+ dquot = ext4_get_dquots(inode)[PRJQUOTA];
+ if (!dquot)
+ goto out_unlock;
- qid = make_kqid_projid(projid);
- dquot = dqget(sb, qid);
- if (IS_ERR(dquot))
- return PTR_ERR(dquot);
spin_lock(&dquot->dq_dqb_lock);
limit = (dquot->dq_dqb.dqb_bsoftlimit ?
@@ -5569,7 +5574,9 @@ static int ext4_statfs_project(struct super_block *sb,
}
spin_unlock(&dquot->dq_dqb_lock);
- dqput(dquot);
+out_unlock:
+ spin_unlock(&inode->i_lock);
+
return 0;
}
#endif
@@ -5609,7 +5616,7 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf)
#ifdef CONFIG_QUOTA
if (ext4_test_inode_flag(dentry->d_inode, EXT4_INODE_PROJINHERIT) &&
sb_has_quota_limits_enabled(sb, PRJQUOTA))
- ext4_statfs_project(sb, EXT4_I(dentry->d_inode)->i_projid, buf);
+ ext4_statfs_project(dentry->d_inode, buf);
#endif
return 0;
}
next reply other threads:[~2019-10-28 10:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 10:38 Konstantin Khlebnikov [this message]
2019-10-30 10:59 ` [PATCH] fs/ext4: get project quota from inode for mangling statfs results Jan Kara
2019-10-30 11:43 ` Konstantin Khlebnikov
[not found] ` <2625831572437163@vla1-6bb9290e4d68.qloud-c.yandex.net>
2019-10-30 12:57 ` Jan Kara
2019-10-31 11:03 Dmitry Monakhov
2019-10-31 16:59 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157225912326.3929.8539227851002947260.stgit@buzz \
--to=khlebnikov@yandex-team.ru \
--cc=dmtrmonakhov@yandex-team.ru \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lixi@ddn.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).